From 925c163ed0f46f8ab04855fb1e224700d1285fc4 Mon Sep 17 00:00:00 2001
From: Konstantin <konstantin.androsov@gmail.com>
Date: Mon, 10 Jul 2023 17:22:13 +0200
Subject: [PATCH] Fixed nanoProdWrapper for Run3 MC

---
 .gitignore           |  3 ++-
 checkLumiOverlaps.py | 18 ------------------
 crabTaskStatus.py    |  1 +
 nanoProdWrapper.py   |  3 ++-
 4 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 checkLumiOverlaps.py

diff --git a/.gitignore b/.gitignore
index ed8ebf5..e05c67c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-__pycache__
\ No newline at end of file
+__pycache__
+/site
\ No newline at end of file
diff --git a/checkLumiOverlaps.py b/checkLumiOverlaps.py
deleted file mode 100644
index 04241ac..0000000
--- a/checkLumiOverlaps.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import json
-import sys
-
-txt = sys.argv[1]
-with open(txt, 'r') as f:
-  files = f.readlines()
-
-lumi_map = {}
-
-for desc in files:
-  file, run, lumis_str = desc.split(' ')
-  lumis = json.loads(lumis_str)
-  for lumi in lumis:
-    if lumi in lumi_map:
-      raise RuntimeError(f'Duplicated lumi={lumi} in file {file} and {lumi_map[file]}')
-    lumi_map[lumi] = file
-
-print("all ok")
\ No newline at end of file
diff --git a/crabTaskStatus.py b/crabTaskStatus.py
index 5f32c50..1130dc9 100644
--- a/crabTaskStatus.py
+++ b/crabTaskStatus.py
@@ -49,6 +49,7 @@ class JobStatus(Enum):
   failed = 6
   transferring = 7
   killed = 8
+  held = 9
 
 class CrabWarning:
   known_warnings = {
diff --git a/nanoProdWrapper.py b/nanoProdWrapper.py
index 0c17e16..97d6649 100644
--- a/nanoProdWrapper.py
+++ b/nanoProdWrapper.py
@@ -59,7 +59,8 @@
     'Run3_2022CDE': '124X_dataRun3_v14',
     'Run3_2022FG': '124X_dataRun3_Prompt_v10',
   }
-  cond_data = cond_data_run3[options.era]
+  if options.sampleType == 'data':
+    cond_data = cond_data_run3[options.era]
   era_str = 'Run3'
   era_mod = ',run3_nanoAOD_124'
 else: