rename modifiers with a more general name

cms-sw · Apr 4, 2019 · 21f1128 · 21f1128
1 parent acec662
commit 21f1128
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 22 deletions.
diff --git a/Configuration/Eras/python/Era_Run2_2016_cff.py b/Configuration/Eras/python/Era_Run2_2016_cff.py
@@ -4,7 +4,7 @@
 from Configuration.Eras.Modifier_run2_25ns_specific_cff import run2_25ns_specific
 from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
 from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
-from Configuration.Eras.Modifier_run2_zcount_2016_cff import run2_zcount_2016
+from Configuration.Eras.Modifier_run2_HLTconditions_2016_cff import run2_HLTconditions_2016
 
-Run2_2016 = cms.ModifierChain(run2_common, run2_25ns_specific, stage2L1Trigger, ctpps_2016, run2_zcount_2016)
+Run2_2016 = cms.ModifierChain(run2_common, run2_25ns_specific, stage2L1Trigger, ctpps_2016, run2_HLTconditions_2016)
 
diff --git a/Configuration/Eras/python/Era_Run2_2017_cff.py b/Configuration/Eras/python/Era_Run2_2017_cff.py
@@ -10,7 +10,7 @@
 from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
 from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
 from Configuration.Eras.Modifier_stage2L1Trigger_2017_cff import stage2L1Trigger_2017
-from Configuration.Eras.Modifier_run2_zcount_2017_cff import run2_zcount_2017
+from Configuration.Eras.Modifier_run2_HLTconditions_2017_cff import run2_HLTconditions_2017
 
-Run2_2017 = cms.ModifierChain(Run2_2016, phase1Pixel, run2_ECAL_2017, run2_HF_2017, run2_HCAL_2017, run2_HE_2017, run2_HEPlan1_2017, trackingPhase1, run2_GEM_2017, stage2L1Trigger_2017, run2_zcount_2017)
+Run2_2017 = cms.ModifierChain(Run2_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)
 
diff --git a/Configuration/Eras/python/Era_Run2_2018_cff.py b/Configuration/Eras/python/Era_Run2_2018_cff.py
@@ -9,6 +9,6 @@
 from Configuration.Eras.Modifier_run2_HCAL_2018_cff import run2_HCAL_2018
 from Configuration.Eras.Modifier_run2_DT_2018_cff import run2_DT_2018
 from Configuration.Eras.Modifier_run2_SiPixel_2018_cff import run2_SiPixel_2018
-from Configuration.Eras.Modifier_run2_zcount_2018_cff import run2_zcount_2018
+from Configuration.Eras.Modifier_run2_HLTconditions_2018_cff import run2_HLTconditions_2018
 
-Run2_2018 = cms.ModifierChain(Run2_2017.copyAndExclude([run2_HEPlan1_2017]), run2_CSC_2018, run2_HCAL_2018, run2_HB_2018, run2_HE_2018,run2_DT_2018, run2_SiPixel_2018, run2_zcount_2018)
+Run2_2018 = cms.ModifierChain(Run2_2017.copyAndExclude([run2_HEPlan1_2017]), run2_CSC_2018, run2_HCAL_2018, run2_HB_2018, run2_HE_2018,run2_DT_2018, run2_SiPixel_2018, run2_HLTconditions_2018)
diff --git a/Configuration/Eras/python/Modifier_run2_zcount_2016_cff.py b/Configuration/Eras/python/Modifier_run2_zcount_2016_cff.py
diff --git a/Configuration/Eras/python/Modifier_run2_zcount_2017_cff.py b/Configuration/Eras/python/Modifier_run2_zcount_2017_cff.py
diff --git a/Configuration/Eras/python/Modifier_run2_zcount_2018_cff.py b/Configuration/Eras/python/Modifier_run2_zcount_2018_cff.py
diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py
@@ -61,7 +61,7 @@ def __init__(self):
                            'run2_nanoAOD_94XMiniAODv1', 'run2_nanoAOD_94XMiniAODv2', 'run2_nanoAOD_94X2016',
                            'run2_miniAOD_devel', 'run2_nanoAOD_102Xv1',
                            'hcalHardcodeConditions', 'hcalSkipPacker',
-                           'run2_zcount_2016','run2_zcount_2017','run2_zcount_2018',
+                           'run2_HLTconditions_2016','run2_HLTconditions_2017','run2_HLTconditions_2018',
                            'bParking']
         internalUseModChains = ['run2_2017_noTrackingModifier']
 

diff --git a/DQMOffline/Lumi/python/ZCounting_cff.py b/DQMOffline/Lumi/python/ZCounting_cff.py
@@ -59,20 +59,20 @@
 
 from Configuration.StandardSequences.Eras import eras
 
-eras.run2_zcount_2016.toModify( zcounting, MuonTriggerNames = cms.vstring("HLT_IsoMu24_v*","HLT_IsoTkMu24_v*"),
+eras.run2_HLTconditions_2016.toModify( zcounting, MuonTriggerNames = cms.vstring("HLT_IsoMu24_v*","HLT_IsoTkMu24_v*"),
                                     MuonTriggerObjectNames = cms.vstring("hltL3crIsoL1sSingleMu22L1f0L2f10QL3f24QL3trkIsoFiltered0p07",
                                                                          "hltL3fL1sMu22L1f0Tkf24QL3trkIsoFiltered0p09"),
                                     PtCutL1  = cms.untracked.double(27.0),
                                     PtCutL2  = cms.untracked.double(27.0)
                        )
 
-eras.run2_zcount_2017.toModify(zcounting, MuonTriggerNames = cms.vstring("HLT_IsoMu27_v*"),
+eras.run2_HLTconditions_2017.toModify(zcounting, MuonTriggerNames = cms.vstring("HLT_IsoMu27_v*"),
                                    MuonTriggerObjectNames = cms.vstring("hltL3crIsoL1sMu22Or25L1f0L2f10QL3f27QL3trkIsoFiltered0p07"),
                                    PtCutL1  = cms.untracked.double(30.0),
                                    PtCutL2  = cms.untracked.double(30.0)
                        )
 
-eras.run2_zcount_2018.toModify(zcounting, MuonTriggerNames = cms.vstring("HLT_IsoMu24_v*"),
+eras.run2_HLTconditions_2018.toModify(zcounting, MuonTriggerNames = cms.vstring("HLT_IsoMu24_v*"),
                                    MuonTriggerObjectNames = cms.vstring("hltL3crIsoL1sSingleMu22L1f0L2f10QL3f24QL3trkIsoFiltered0p07"),
                                    PtCutL1  = cms.untracked.double(27.0),
                                    PtCutL2  = cms.untracked.double(27.0)