Merge pull request #28466 from jainshilpi/UL2016changes_11_0_X_tmp

Changes for new trained regression for UL 2016 - 110X
cms-sw · Nov 26, 2019 · de9eabe · de9eabe
2 parents bf82216 + 857cfe1
commit de9eabe
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/Configuration/Eras/python/Era_Run2_2016_cff.py b/Configuration/Eras/python/Era_Run2_2016_cff.py
@@ -11,7 +11,8 @@
 from Configuration.Eras.Modifier_pixel_2016_cff import pixel_2016
 from Configuration.Eras.Modifier_run2_jme_2016_cff import run2_jme_2016
 from Configuration.Eras.Modifier_strips_vfp30_2016_cff import strips_vfp30_2016
+from Configuration.Eras.Modifier_run2_ECAL_2016_cff import run2_ECAL_2016
 
 Run2_2016 = cms.ModifierChain(run2_common, run2_25ns_specific,
- stage2L1Trigger, ctpps_2016, run2_HLTconditions_2016, run2_muon_2016, run2_egamma_2016, run2_L1prefiring, pixel_2016, run2_jme_2016, strips_vfp30_2016)
+ stage2L1Trigger, ctpps_2016, run2_HLTconditions_2016, run2_ECAL_2016, run2_muon_2016, run2_egamma_2016, run2_L1prefiring, pixel_2016, run2_jme_2016, strips_vfp30_2016)
 
diff --git a/Configuration/Eras/python/Era_Run2_2017_cff.py b/Configuration/Eras/python/Era_Run2_2017_cff.py
@@ -3,6 +3,7 @@
 from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
 from Configuration.Eras.Modifier_run2_ECAL_2017_cff import run2_ECAL_2017
+from Configuration.Eras.Modifier_run2_ECAL_2016_cff import run2_ECAL_2016
 from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017
 from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017
 from Configuration.Eras.Modifier_run2_HE_2017_cff import run2_HE_2017
@@ -22,7 +23,7 @@
 from Configuration.Eras.Modifier_run2_jme_2016_cff import run2_jme_2016
 from Configuration.Eras.Modifier_strips_vfp30_2016_cff import strips_vfp30_2016
 
-Run2_2017 = cms.ModifierChain(Run2_2016.copyAndExclude([run2_muon_2016, run2_HLTconditions_2016,run2_egamma_2016,pixel_2016,run2_jme_2016, strips_vfp30_2016]),
-phase1Pixel, run2_ECAL_2017, run2_HF_2017, run2_HCAL_2017, run2_HE_2017, run2_HEPlan1_2017, 
-trackingPhase1, run2_GEM_2017, stage2L1Trigger_2017, run2_HLTconditions_2017, run2_muon_2017,run2_egamma_2017, ctpps_2017, run2_jme_2017)
+Run2_2017 = cms.ModifierChain(Run2_2016.copyAndExclude([run2_muon_2016, run2_HLTconditions_2016, run2_ECAL_2016, run2_egamma_2016,pixel_2016,run2_jme_2016, strips_vfp30_2016]),
+                              phase1Pixel, run2_ECAL_2017, run2_HF_2017, run2_HCAL_2017, run2_HE_2017, run2_HEPlan1_2017, 
+                              trackingPhase1, run2_GEM_2017, stage2L1Trigger_2017, run2_HLTconditions_2017, run2_muon_2017,run2_egamma_2017, ctpps_2017, run2_jme_2017)
 
diff --git a/Configuration/Eras/python/Modifier_run2_ECAL_2016_cff.py b/Configuration/Eras/python/Modifier_run2_ECAL_2016_cff.py
@@ -0,0 +1,3 @@
+import FWCore.ParameterSet.Config as cms
+
+run2_ECAL_2016 =  cms.Modifier()
diff --git a/RecoEgamma/EgammaTools/python/regressionModifier_cfi.py b/RecoEgamma/EgammaTools/python/regressionModifier_cfi.py
@@ -240,11 +240,11 @@
 regressionModifier = regressionModifier94X.clone()
 
 
+from Configuration.Eras.Modifier_run2_egamma_2016_cff import run2_egamma_2016
 from Configuration.Eras.Modifier_run2_egamma_2017_cff import run2_egamma_2017
-run2_egamma_2017.toReplaceWith(regressionModifier,regressionModifier106XUL)
-
 from Configuration.Eras.Modifier_run2_egamma_2018_cff import run2_egamma_2018
-run2_egamma_2018.toReplaceWith(regressionModifier,regressionModifier106XUL)
+
+(run2_egamma_2016 | run2_egamma_2017 | run2_egamma_2018).toReplaceWith(regressionModifier,regressionModifier106XUL)
 
 from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive
 egamma_lowPt_exclusive.toReplaceWith(regressionModifier,regressionModifier103XLowPtPho)
diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterECAL_cff.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterECAL_cff.py
@@ -4,7 +4,10 @@
 particleFlowClusterECAL.energyCorrector.applyMVACorrections = True
 particleFlowClusterECAL.energyCorrector.maxPtForMVAEvaluation = 90.
 
+
+from Configuration.Eras.Modifier_run2_ECAL_2016_cff import run2_ECAL_2016
 from Configuration.Eras.Modifier_run2_ECAL_2017_cff import run2_ECAL_2017
-run2_ECAL_2017.toModify(particleFlowClusterECAL,
+
+(run2_ECAL_2016 | run2_ECAL_2017).toModify(particleFlowClusterECAL,
                         energyCorrector = dict(srfAwareCorrection = True, maxPtForMVAEvaluation = 300.))
 
diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterOOTECAL_cff.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterOOTECAL_cff.py
@@ -5,8 +5,9 @@
 particleFlowClusterOOTECAL.inputECAL = cms.InputTag("particleFlowClusterOOTECALUncorrected")
 
 from Configuration.Eras.Modifier_run2_miniAOD_80XLegacy_cff import run2_miniAOD_80XLegacy
-run2_miniAOD_80XLegacy.toModify(
-    particleFlowClusterOOTECAL.energyCorrector, 
-    recHitsEBLabel = "reducedEcalRecHitsEB",
-    recHitsEELabel = "reducedEcalRecHitsEE"
-)
+run2_miniAOD_80XLegacy.toModify(particleFlowClusterOOTECAL,
+                                energyCorrector = dict( 
+                                    maxPtForMVAEvaluation = 90., srfAwareCorrection = False, 
+                                    recHitsEBLabel = "reducedEcalRecHitsEB", recHitsEELabel = "reducedEcalRecHitsEE"
+                                )
+                            )