Merge pull request cms-sw#21 from gpetruc/l1pf_106X_v0_oldhgc_106XMC

Calibrations for 10_6_X MC
gpetruc · Sep 11, 2019 · beae7cb · beae7cb
2 parents debc644 + 18d974d
commit beae7cb
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 2 deletions.
diff --git a/L1Trigger/Phase2L1ParticleFlow/data/emcorr_barrel_106X.root b/L1Trigger/Phase2L1ParticleFlow/data/emcorr_barrel_106X.root
diff --git a/L1Trigger/Phase2L1ParticleFlow/data/emcorr_hgc_106X.root b/L1Trigger/Phase2L1ParticleFlow/data/emcorr_hgc_106X.root
diff --git a/L1Trigger/Phase2L1ParticleFlow/data/hadcorr_HGCal3D_TC_106X.root b/L1Trigger/Phase2L1ParticleFlow/data/hadcorr_HGCal3D_TC_106X.root
diff --git a/L1Trigger/Phase2L1ParticleFlow/data/hadcorr_barrel_106X.root b/L1Trigger/Phase2L1ParticleFlow/data/hadcorr_barrel_106X.root
diff --git a/L1Trigger/Phase2L1ParticleFlow/data/hfcorr_106X.root b/L1Trigger/Phase2L1ParticleFlow/data/hfcorr_106X.root
diff --git a/L1Trigger/Phase2L1ParticleFlow/data/jecs/jecs.PU200_106X.root b/L1Trigger/Phase2L1ParticleFlow/data/jecs/jecs.PU200_106X.root
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1ParticleFlow_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/l1ParticleFlow_cff.py
@@ -5,6 +5,9 @@
 from L1Trigger.Phase2L1ParticleFlow.pfClustersFromCombinedCalo_cfi import pfClustersFromCombinedCalo
 from L1Trigger.Phase2L1ParticleFlow.l1pfProducer_cfi import l1pfProducer
 
+# Using phase2_hgcalV10 to customize the config for all 106X samples, since there's no other modifier for it
+from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
+
 # Calorimeter part: ecal + hcal + hf only
 pfClustersFromCombinedCaloHCal = pfClustersFromCombinedCalo.clone(
     hcalHGCTowers = [], hcalDigis = [],
@@ -16,6 +19,15 @@
             scale   = cms.vdouble( 0.122,  0.143,  0.465),
             kind    = cms.string('calo'),
     ))
+phase2_hgcalV10.toModify(pfClustersFromCombinedCaloHCal,
+    hadCorrector  = "L1Trigger/Phase2L1ParticleFlow/data/hadcorr_barrel_106X.root",
+    resol = cms.PSet(
+            etaBins = cms.vdouble( 0.700,  1.200,  1.600),
+            offset  = cms.vdouble( 2.970,  2.931,  0.527),
+            scale   = cms.vdouble( 0.123,  0.130,  0.429),
+            kind    = cms.string('calo'),
+    )
+)
 pfTracksFromL1TracksBarrel = pfTracksFromL1Tracks.clone(
     resolCalo = pfClustersFromCombinedCaloHCal.resol.clone(),
 )
@@ -30,8 +42,15 @@
             scale   = cms.vdouble( 0.152,  0.151,  0.144,  0.179),
             kind    = cms.string('calo'),
     ))
-
-
+phase2_hgcalV10.toModify(pfClustersFromCombinedCaloHF,
+    hadCorrector  = "L1Trigger/Phase2L1ParticleFlow/data/hfcorr_106X.root",
+    resol = cms.PSet(
+            etaBins = cms.vdouble( 3.500,  4.000,  4.500,  5.000),
+            offset  = cms.vdouble( 0.508,  0.986,  1.664,  1.379),
+            scale   = cms.vdouble( 0.758,  0.154,  0.135,  0.184),
+            kind    = cms.string('calo'),
+    )
+)
 
 # Calorimeter part: hgcal
 from L1Trigger.Phase2L1ParticleFlow.pfClustersFromHGC3DClusters_cfi import pfClustersFromHGC3DClusters

diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py b/L1Trigger/Phase2L1ParticleFlow/python/l1pfJetMet_cff.py
@@ -20,6 +20,9 @@
     correctorDir = cms.string("_dir_"),
     copyDaughters = cms.bool(False)
 )
+# Using phase2_hgcalV10 to customize the config for all 106X samples, since there's no other modifier for it
+from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
+phase2_hgcalV10.toModify(_correctedJets, correctorFile = "L1Trigger/Phase2L1ParticleFlow/data/jecs/jecs.PU200_106X.root")
 
 ak4PFL1CaloCorrected = _correctedJets.clone(jets = 'ak4PFL1Calo', correctorDir = 'L1CaloJets')
 ak4PFL1PFCorrected = _correctedJets.clone(jets = 'ak4PFL1PF', correctorDir = 'L1PFJets')

diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClustersEM_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClustersEM_cfi.py
@@ -14,3 +14,15 @@
             kind    = cms.string('calo'),
     )
 )
+
+
+from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
+phase2_hgcalV10.toModify(pfClustersFromHGC3DClustersEM,
+    corrector = "L1Trigger/Phase2L1ParticleFlow/data/emcorr_hgc_106X.root",
+    resol = cms.PSet(
+        etaBins = cms.vdouble( 1.900,  2.200,  2.500,  2.800,  2.950),
+        offset  = cms.vdouble( 0.714,  0.618,  0.527,  0.443,  0.304),
+        scale   = cms.vdouble( 0.030,  0.025,  0.022,  0.023,  0.025),
+        kind    = cms.string('calo')
+    ),
+) 
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClusters_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromHGC3DClusters_cfi.py
@@ -49,3 +49,15 @@
         kind    = cms.string('calo')
     ),
 )
+
+
+from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
+phase2_hgcalV10.toModify(pfClustersFromHGC3DClusters,
+    corrector = "L1Trigger/Phase2L1ParticleFlow/data/hadcorr_HGCal3D_TC_106X.root",
+    resol = cms.PSet(
+        etaBins = cms.vdouble( 1.900,  2.200,  2.500,  2.800,  2.950),
+        offset  = cms.vdouble( 2.801,  2.735,  2.778,  2.986,  2.808),
+        scale   = cms.vdouble( 0.106,  0.101,  0.101,  0.097,  0.124),
+        kind    = cms.string('calo')
+    ),
+) 
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromL1EGClusters_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/pfClustersFromL1EGClusters_cfi.py
@@ -11,3 +11,15 @@
             kind    = cms.string('calo'),
     )
 )
+
+# use phase2_hgcalV10 to customize for 106X L1TDR MC even in the barrel, since there's no other modifier for it
+from Configuration.Eras.Modifier_phase2_hgcalV10_cff import phase2_hgcalV10
+phase2_hgcalV10.toModify(pfClustersFromL1EGClusters,
+    corrector  = "L1Trigger/Phase2L1ParticleFlow/data/emcorr_barrel_106X.root",
+    resol = cms.PSet(
+        etaBins = cms.vdouble( 0.700,  1.200,  1.600),
+        offset  = cms.vdouble( 1.047,  1.096,  1.633),
+        scale   = cms.vdouble( 0.014,  0.031,  0.019),
+        kind    = cms.string('calo')
+    )
+)