Merge pull request #1 from EmyrClement/JECFix

Add missing JECs
mmusich · Apr 12, 2022 · 437cc15 · 437cc15
2 parents 6e11d3d + 015a2f5
commit 437cc15
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 13 deletions.
diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9Jets_cfi.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9Jets_cfi.py
@@ -150,6 +150,24 @@
             571.5, 670.875, 730.375, float('inf')
         )
     ), 
+    cms.PSet(
+        etaMax = cms.double(3),
+        etaMin = cms.double(2.5),
+        l1tCalibrationFactors = cms.vdouble(
+            0.674661962699, 0.674661962699, 0.727593234951, 0.822725694893, 0.927569668143, 
+            0.97660505882, 0.987209098964, 1.03132324625, 1.02714227345, 1.02334276675, 
+            1.01880895382, 1.01335319939, 1.01008031255, 1.00497131654, 1.00149634384, 
+            0.991533222988, 0.9837688439, 1.00989570361, 1.00167820652, 0.985530405844, 
+            0.971802700851, 0.943756240228, 0.937016745904
+        ),
+        l1tPtBins = cms.vdouble(
+            -float('inf'), 26.0451028139, 30.9749499579, 36.7640499457, 45.5682186743, 
+            55.4542083976, 65.3014519722, 75.6207108652, 85.4615770865, 94.6729848702, 
+            104.29165568, 115.822037843, 125.897005668, 135.571730212, 145.479710821, 
+            160.990528129, 181.45236014, 203.493072087, 229.468858801, 267.709270335, 
+            314.597744361, 380.160714286, 434.755952381, float('inf')
+        )
+    ), 
     cms.PSet(
         etaMax = cms.double(5.191),
         etaMin = cms.double(3),

diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9trimmedJets_cfi.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_9x9trimmedJets_cfi.py
@@ -150,6 +150,24 @@
             584.5625, 670.875, 730.375, float('inf')
         )
     ), 
+    cms.PSet(
+        etaMax = cms.double(3),
+        etaMin = cms.double(2.5),
+        l1tCalibrationFactors = cms.vdouble(
+            0.482004686949, 0.482004686949, 0.564202174589, 0.736584151614, 0.911565084921, 
+            0.987344739275, 0.993152983902, 1.03806284348, 1.03244226103, 1.0260158536, 
+            1.02041940616, 1.0134090195, 1.0076503873, 1.00104447561, 0.995969648589, 
+            0.981247152992, 0.971158824688, 0.966585664599, 0.963405635485, 0.958075648063, 
+            0.952490699151, 0.940177797744, 0.938930857749
+        ),
+        l1tPtBins = cms.vdouble(
+            -float('inf'), 25.9618281426, 30.6891444166, 36.5086109677, 45.3574132365, 
+            55.0008759284, 64.7493209607, 75.2843507883, 85.0009967022, 94.7383169517, 
+            104.456129397, 114.645959573, 124.966880164, 134.960872423, 144.402159807, 
+            160.403905664, 180.457955711, 202.51439951, 229.539912281, 264.65878483, 
+            309.702205882, 383.5625, 439.520833333, float('inf')
+        )
+    ), 
     cms.PSet(
         etaMax = cms.double(5.191),
         etaMin = cms.double(3),

diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_cfi.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJetCalibrator_cfi.py
@@ -150,6 +150,24 @@
             572.166666667, 670.875, 730.375, float('inf')
         )
     ), 
+    cms.PSet(
+        etaMax = cms.double(3),
+        etaMin = cms.double(2.5),
+        l1tCalibrationFactors = cms.vdouble(
+            0.568401538708, 0.568401538708, 0.631816583718, 0.767769487666, 0.91701775882, 
+            0.984206551733, 0.996248540801, 1.02919753052, 1.02695009331, 1.02474790333, 
+            1.02239529801, 1.019105609, 1.01734381454, 1.01477529176, 1.01258536715, 
+            1.00685181266, 1.00282299224, 0.977440455757, 0.978190703485, 0.979728137914, 
+            0.981198285812, 0.98300553818, 0.984443527319
+        ),
+        l1tPtBins = cms.vdouble(
+            -float('inf'), 25.7442980683, 30.4775600841, 36.2227147641, 45.0210408195, 
+            54.8248076715, 64.6373689105, 75.0414582144, 84.6064437163, 93.5522537304, 
+            102.70950032, 114.053123287, 124.208942991, 132.914884799, 142.481566353, 
+            158.411426474, 178.038318239, 200.039800625, 226.059381044, 263.009688995, 
+            311.587719298, 364.523809524, 416.94047619, float('inf')
+        )
+    ), 
     cms.PSet(
         etaMax = cms.double(5.191),
         etaMin = cms.double(3),

diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py
@@ -6,16 +6,16 @@
 from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import Phase1L1TJetSumsProducer
 
 Phase1L1TJetProducer9x9 = Phase1L1TJetProducer.clone(
-	  jetIEtaSize = cms.uint32(9),
-	  jetIPhiSize = cms.uint32(9),
-	  outputCollectionName = cms.string("UncalibratedPhase1L1TJetFromPfCandidates")
+	  jetIEtaSize = 9,
+	  jetIPhiSize = 9,
+	  outputCollectionName = "UncalibratedPhase1L1TJetFromPfCandidates"
 )
 
-Phase1L1TJetCalibrator9x9.inputCollectionTag = cms.InputTag("Phase1L1TJetProducer9x9", "UncalibratedPhase1L1TJetFromPfCandidates", "")
-Phase1L1TJetCalibrator9x9.outputCollectionName = cms.string("Phase1L1TJetFromPfCandidates")
+Phase1L1TJetCalibrator9x9.inputCollectionTag = ("Phase1L1TJetProducer9x9", "UncalibratedPhase1L1TJetFromPfCandidates", "")
+Phase1L1TJetCalibrator9x9.outputCollectionName = ("Phase1L1TJetFromPfCandidates")
 
 Phase1L1TJetSumsProducer9x9 = Phase1L1TJetSumsProducer.clone(
-  inputJetCollectionTag = cms.InputTag("Phase1L1TJetCalibrator9x9", "Phase1L1TJetFromPfCandidates"),
+  inputJetCollectionTag = ("Phase1L1TJetCalibrator9x9", "Phase1L1TJetFromPfCandidates"),
 )
 
 Phase1L1TJetsSequence9x9 = cms.Sequence(

diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9trimmed_cff.py
@@ -6,18 +6,18 @@
 from L1Trigger.L1CaloTrigger.Phase1L1TJetSumsProducer_cfi import Phase1L1TJetSumsProducer
 
 Phase1L1TJetProducer9x9trimmed = Phase1L1TJetProducer.clone(
-	  jetIEtaSize = cms.uint32(9),
-	  jetIPhiSize = cms.uint32(9),
-	  trimmedGrid = cms.bool(True),
-	  outputCollectionName = cms.string("UncalibratedPhase1L1TJetFromPfCandidates")
+	  jetIEtaSize = 9,
+	  jetIPhiSize = 9,
+	  trimmedGrid = True,
+	  outputCollectionName = "UncalibratedPhase1L1TJetFromPfCandidates"
 )
 
-Phase1L1TJetCalibrator9x9trimmed.inputCollectionTag = cms.InputTag("Phase1L1TJetProducer9x9trimmed", "UncalibratedPhase1L1TJetFromPfCandidates", "")
-Phase1L1TJetCalibrator9x9trimmed.outputCollectionName = cms.string("Phase1L1TJetFromPfCandidates")
+Phase1L1TJetCalibrator9x9trimmed.inputCollectionTag = ("Phase1L1TJetProducer9x9trimmed", "UncalibratedPhase1L1TJetFromPfCandidates", "")
+Phase1L1TJetCalibrator9x9trimmed.outputCollectionName = ("Phase1L1TJetFromPfCandidates")
 
 
 Phase1L1TJetSumsProducer9x9trimmed = Phase1L1TJetSumsProducer.clone(
-  inputJetCollectionTag = cms.InputTag("Phase1L1TJetCalibrator9x9trimmed", "Phase1L1TJetFromPfCandidates"),
+  inputJetCollectionTag = ("Phase1L1TJetCalibrator9x9trimmed", "Phase1L1TJetFromPfCandidates"),
 )
 
 Phase1L1TJetsSequence9x9trimmed = cms.Sequence(