Merge pull request #31935 from mandrenguyen/ppOnAACommon

Common pp_on_AA modifier for 2018 and run 3 AA eras
cms-sw · Nov 4, 2020 · caa4836 · caa4836
2 parents a7272ef + 1cb8ede
commit caa4836
Show file tree

Hide file tree

Showing 119 changed files with 418 additions and 463 deletions.
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_cff.py
@@ -53,7 +53,7 @@
 
 ## customizations for the pp_on_AA eras
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlJpsiMuMuHLT,
-                                           eventSetupPathsKey='TkAlJpsiMuMuHI'
-                                           )
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlJpsiMuMuHLT,
+                                      eventSetupPathsKey='TkAlJpsiMuMuHI'
+)
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py
@@ -48,12 +48,12 @@
 
 ## customizations for the pp_on_AA eras
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlMinBiasHLT,
-                                           eventSetupPathsKey='TkAlMinBiasHI'
-                                           )
-
-(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlMinBias,
-                                           trackQualities = cms.vstring("highPurity")
-                                           )
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMinBiasHLT,
+                                      eventSetupPathsKey='TkAlMinBiasHI'
+)
+
+(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMinBias,
+                                    trackQualities = cms.vstring("highPurity")
+)
 
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_cff.py
@@ -52,11 +52,11 @@
 
 ## customizations for the pp_on_AA eras
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlMuonIsolatedHLT,
-                                           eventSetupPathsKey='TkAlMuonIsolatedHI'
-                                           )
-
-(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlMuonIsolated.GlobalSelector,
-                                           minJetDeltaR=0.0
-                                           )
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMuonIsolatedHLT,
+                                      eventSetupPathsKey='TkAlMuonIsolatedHI'
+)
+
+(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMuonIsolated.GlobalSelector,
+                                    minJetDeltaR=0.0
+)
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_cff.py
@@ -58,7 +58,7 @@
 
 ## customizations for the pp_on_AA eras
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlUpsilonMuMuHLT,
-                                           eventSetupPathsKey='TkAlUpsilonMuMuHI'
-                                           )
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlUpsilonMuMuHLT,
+                                      eventSetupPathsKey='TkAlUpsilonMuMuHI'
+)
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_cff.py
@@ -55,7 +55,7 @@
 
 ## customizations for the pp_on_AA eras
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlZMuMuHLT,
-                                           eventSetupPathsKey='TkAlZMuMuHI'
-                                           )
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlZMuMuHLT,
+                                      eventSetupPathsKey='TkAlZMuMuHI'
+)
diff --git a/CalibMuon/DTCalibration/python/ALCARECODtCalib_Output_cff.py b/CalibMuon/DTCalibration/python/ALCARECODtCalib_Output_cff.py
@@ -41,14 +41,14 @@
 OutALCARECODtCalib = copy.deepcopy(OutALCARECODtCalib_noDrop)
 OutALCARECODtCalib.outputCommands.insert(0, "drop *")
 
-## customizations for the pp_on_AA_2018 eras
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
+## customizations for the pp_on_AA eras
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 
 OutALCARECODtCalibHI = copy.deepcopy(OutALCARECODtCalib_noDrop)
 OutALCARECODtCalibHI.outputCommands.insert(0, "drop *")
 OutALCARECODtCalibHI.outputCommands.append("keep *_offlinePrimaryVertices__*")
 OutALCARECODtCalibHI.outputCommands.append("keep *_offlinePrimaryVerticesWithBS_*_*")
 OutALCARECODtCalibHI.outputCommands.append("keep *_offlinePrimaryVerticesFromCosmicTracks_*_*")
 
-#Specify to use HI output for the pp_on_AA_2018 eras
-pp_on_AA_2018.toReplaceWith(OutALCARECODtCalib,OutALCARECODtCalibHI)
+#Specify to use HI output for the pp_on_AA eras
+pp_on_AA.toReplaceWith(OutALCARECODtCalib,OutALCARECODtCalibHI)
diff --git a/CalibMuon/DTCalibration/python/ALCARECODtCalib_cff.py b/CalibMuon/DTCalibration/python/ALCARECODtCalib_cff.py
@@ -22,13 +22,13 @@
 
 seqALCARECODtCalib = cms.Sequence(primaryVertexFilter * noscraping * ALCARECODtCalibHLTFilter * DTCalibMuonSelection * dt4DSegmentsNoWire) 
 
-## customizations for the pp_on_AA_2018 eras
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-pp_on_AA_2018.toModify(ALCARECODtCalibHLTFilter,
-                       eventSetupPathsKey='DtCalibHI'
+## customizations for the pp_on_AA eras
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+pp_on_AA.toModify(ALCARECODtCalibHLTFilter,
+                  eventSetupPathsKey='DtCalibHI'
 )
 
 seqALCARECODtCalibHI = cms.Sequence(ALCARECODtCalibHLTFilter * dt4DSegmentsNoWire)
 
-#Specify to use HI sequence for the pp_on_AA_2018 eras
-pp_on_AA_2018.toReplaceWith(seqALCARECODtCalib,seqALCARECODtCalibHI)
+#Specify to use HI sequence for the pp_on_AA eras
+pp_on_AA.toReplaceWith(seqALCARECODtCalib,seqALCARECODtCalibHI)
diff --git a/CalibTracker/SiPixelQuality/python/ALCARECOSiPixelCalZeroBias_cff.py b/CalibTracker/SiPixelQuality/python/ALCARECOSiPixelCalZeroBias_cff.py
@@ -31,7 +31,7 @@
 
 ## customizations for the pp_on_AA eras
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOSiPixelCalZeroBiasHLT,
-                                           eventSetupPathsKey='SiStripCalZeroBiasHI'
-                                           )
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOSiPixelCalZeroBiasHLT,
+                                      eventSetupPathsKey='SiStripCalZeroBiasHI'
+)
diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_Output_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_Output_cff.py
@@ -24,11 +24,11 @@
 OutALCARECOHcalCalMinBias=copy.deepcopy(OutALCARECOHcalCalMinBias_noDrop)
 OutALCARECOHcalCalMinBias.outputCommands.insert(0, "drop *")
 
-## customizations for the pp_on_AA_2018 eras
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
+## customizations for the pp_on_AA eras
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 OutALCARECOHcalCalMinBiasHI = copy.deepcopy(OutALCARECOHcalCalMinBias_noDrop)
 OutALCARECOHcalCalMinBiasHI.outputCommands.insert(0, "drop *")
 OutALCARECOHcalCalMinBiasHI.outputCommands.insert(6, "keep HFRecHitsSorted_hfreco_*_*")
 
-#Specify to use HI output for the pp_on_AA_2018 eras
-pp_on_AA_2018.toReplaceWith(OutALCARECOHcalCalMinBias,OutALCARECOHcalCalMinBiasHI)
+#Specify to use HI output for the pp_on_AA 
+pp_on_AA.toReplaceWith(OutALCARECOHcalCalMinBias,OutALCARECOHcalCalMinBiasHI)
diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py
@@ -13,10 +13,10 @@
     throw = False #dont throw except on unknown path name 
 )
 
-## customizations for the pp_on_AA_2018 eras
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-pp_on_AA_2018.toModify(hcalminbiasHLT,
-                       eventSetupPathsKey='HcalCalMinBiasHI'
+## customizations for the pp_on_AA eras
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+pp_on_AA.toModify(hcalminbiasHLT,
+                  eventSetupPathsKey='HcalCalMinBiasHI'
 )
 
 
@@ -67,11 +67,11 @@
 
 seqALCARECOHcalCalMinBias = cms.Sequence(hbherecoMBNZS*horecoMBNZS*hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise)
 
-#Specify to use HI output for the pp_on_AA_2018 eras
+#Specify to use HI output for the pp_on_AA eras
 seqALCARECOHcalCalMinBiasHI = cms.Sequence(hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise)
-pp_on_AA_2018.toReplaceWith(seqALCARECOHcalCalMinBias,
-                            seqALCARECOHcalCalMinBiasHI
-)
+pp_on_AA.toReplaceWith(seqALCARECOHcalCalMinBias,
+                       seqALCARECOHcalCalMinBiasHI
+                   )
 
 import RecoLocalCalo.HcalRecProducers.hfprereco_cfi
 hfprerecoNoise = RecoLocalCalo.HcalRecProducers.hfprereco_cfi.hfprereco.clone(

diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_cff.py
@@ -44,7 +44,7 @@
 
 ## customizations for the pp_on_AA eras
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOSiStripCalMinBiasAAGHLT,
-                                           eventSetupPathsKey='SiStripCalMinBiasAAGHI'
-                                           )
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOSiStripCalMinBiasAAGHLT,
+                                      eventSetupPathsKey='SiStripCalMinBiasAAGHI'
+)
diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_cff.py
@@ -42,7 +42,7 @@
 
 ## customizations for the pp_on_AA eras
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOSiStripCalMinBiasHLT,
-                                           eventSetupPathsKey='SiStripCalMinBiasHI'
-                                           )
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOSiStripCalMinBiasHLT,
+                                    eventSetupPathsKey='SiStripCalMinBiasHI'
+)
diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalZeroBias_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalZeroBias_cff.py
@@ -58,10 +58,10 @@
 
 ## customizations for the pp_on_AA eras
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOSiStripCalZeroBiasHLT,
-                                           eventSetupPathsKey='SiStripCalZeroBiasHI'
-                                           )
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOSiStripCalZeroBiasHLT,
+                                      eventSetupPathsKey='SiStripCalZeroBiasHI'
+)
 
 # Select pp-like events based on the pixel cluster multiplicity
 import HLTrigger.special.hltPixelActivityFilter_cfi
@@ -72,6 +72,6 @@
 seqALCARECOSiStripCalZeroBiasHI = cms.Sequence(ALCARECOSiStripCalZeroBiasHLT*HLTPixelActivityFilterForSiStripCalZeroBias*DCSStatusForSiStripCalZeroBias*calZeroBiasClusters*APVPhases*consecutiveHEs)
 
 #Specify we want to use our other sequence 
-(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(seqALCARECOSiStripCalZeroBias,
-                                                seqALCARECOSiStripCalZeroBiasHI
-                                                )
+(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(seqALCARECOSiStripCalZeroBias,
+                                           seqALCARECOSiStripCalZeroBiasHI
+)
diff --git a/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py b/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py
@@ -1,7 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
 from Configuration.Eras.Modifier_pf_badHcalMitigation_cff import pf_badHcalMitigation
 
-Run2_2018_pp_on_AA = cms.ModifierChain(Run2_2018, pp_on_AA_2018, pf_badHcalMitigation)
+Run2_2018_pp_on_AA = cms.ModifierChain(Run2_2018, pp_on_AA, pp_on_AA_2018, pf_badHcalMitigation)
diff --git a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_cff.py b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_cff.py
@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.Eras.Era_Run3_cff import Run3
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
 
-Run3_pp_on_PbPb = cms.ModifierChain(Run3, pp_on_PbPb_run3)
+Run3_pp_on_PbPb = cms.ModifierChain(Run3, pp_on_AA, pp_on_PbPb_run3)
diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py
@@ -219,7 +219,7 @@ def SwapKeepAndDrop(l):
 from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
 from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
 from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 from RecoLocalFastTime.Configuration.RecoLocalFastTime_EventContent_cff import *
 from RecoMTD.Configuration.RecoMTD_EventContent_cff import *
 
@@ -503,7 +503,7 @@ def SwapKeepAndDrop(l):
     outputCommands = FEVTEventContent.outputCommands + ['keep *_muonGEMDigis_*_*'])
 run3_GEM.toModify(FEVTEventContent, 
     outputCommands = FEVTEventContent.outputCommands + ['keep *_muonGEMDigis_*_*'])
-pp_on_AA_2018.toModify(FEVTEventContent, 
+pp_on_AA.toModify(FEVTEventContent, 
     outputCommands = FEVTEventContent.outputCommands + ['keep FEDRawDataCollection_rawDataRepacker_*_*'])
 phase2_timing_layer.toModify(FEVTEventContent, 
     outputCommands = FEVTEventContent.outputCommands + RecoLocalFastTimeFEVT.outputCommands)

diff --git a/Configuration/ProcessModifiers/python/pp_on_AA_cff.py b/Configuration/ProcessModifiers/python/pp_on_AA_cff.py
@@ -0,0 +1,3 @@
+import FWCore.ParameterSet.Config as cms
+
+pp_on_AA =  cms.Modifier()
diff --git a/Configuration/StandardSequences/python/Reconstruction_cff.py b/Configuration/StandardSequences/python/Reconstruction_cff.py
@@ -181,17 +181,16 @@
 
 # AA data with pp reco
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 from RecoHI.HiTracking.HILowPtConformalPixelTracks_cfi import *
 from RecoHI.HiCentralityAlgos.HiCentrality_cfi import hiCentrality
 from RecoHI.HiCentralityAlgos.HiClusterCompatibility_cfi import hiClusterCompatibility
 _highlevelreco_HITask = highlevelrecoTask.copy()
 _highlevelreco_HITask.add(hiConformalPixelTracksTaskPhase1)
 _highlevelreco_HITask.add(hiCentrality)
 _highlevelreco_HITask.add(hiClusterCompatibility)
-(pp_on_XeXe_2017 | pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(highlevelrecoTask, _highlevelreco_HITask)
-pp_on_AA_2018.toReplaceWith(highlevelrecoTask,highlevelrecoTask.copyAndExclude([PFTauTask]))
+(pp_on_XeXe_2017 | pp_on_AA ).toReplaceWith(highlevelrecoTask, _highlevelreco_HITask)
+pp_on_AA.toReplaceWith(highlevelrecoTask,highlevelrecoTask.copyAndExclude([PFTauTask]))
 
 # not commisoned and not relevant in FastSim (?):
 _fastSim_highlevelrecoTask = highlevelrecoTask.copyAndExclude([muoncosmichighlevelrecoTask])

diff --git a/DQM/Physics/python/DQMPhysics_cff.py b/DQM/Physics/python/DQMPhysics_cff.py
@@ -50,11 +50,11 @@
 dqmPhysicspA  =  dqmPhysics.copy()
 dqmPhysicspA += CentralitypADQM
 pA_2016.toReplaceWith(dqmPhysics, dqmPhysicspA)
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 _dqmPhysics  =  dqmPhysics.copy()
 _dqmPhysics += CentralityDQM
-pp_on_AA_2018.toModify(CentralityDQM, vertexcollection=cms.InputTag("offlinePrimaryVertices"))
-pp_on_AA_2018.toReplaceWith(dqmPhysics, _dqmPhysics)
+pp_on_AA.toModify(CentralityDQM, vertexcollection=cms.InputTag("offlinePrimaryVertices"))
+pp_on_AA.toReplaceWith(dqmPhysics, _dqmPhysics)
 
 bphysicsOniaDQMHI = bphysicsOniaDQM.clone(vertex=cms.InputTag("hiSelectedVertex"))
 dqmPhysicsHI = cms.Sequence(bphysicsOniaDQMHI+CentralityDQM)

diff --git a/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_cff.py b/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_cff.py
@@ -38,10 +38,10 @@
     getQualityTestsFromFile = cms.untracked.bool(True)
 )
 
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-pp_on_AA_2018.toModify(siStripQTester,
-                       qtList = cms.untracked.FileInPath('DQM/SiStripMonitorClient/data/sistrip_qualitytest_config_tier0_heavyions.xml')
-                       )
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+pp_on_AA.toModify(siStripQTester,
+                  qtList = cms.untracked.FileInPath('DQM/SiStripMonitorClient/data/sistrip_qualitytest_config_tier0_heavyions.xml')
+)
 
 from CalibTracker.SiStripESProducers.SiStripQualityESProducer_cfi import siStripQualityESProducer 
 mergedSiStripQualityProducer = siStripQualityESProducer.clone(

diff --git a/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_cff.py b/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_cff.py
@@ -67,10 +67,10 @@
     getQualityTestsFromFile = cms.untracked.bool(True)
 )
 
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-pp_on_AA_2018.toModify(trackingQTester,
-                       qtList = cms.untracked.FileInPath('DQM/TrackingMonitorClient/data/tracking_qualitytest_config_tier0_heavyions.xml')
-                       )
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+pp_on_AA.toModify(trackingQTester,
+                  qtList = cms.untracked.FileInPath('DQM/TrackingMonitorClient/data/tracking_qualitytest_config_tier0_heavyions.xml')
+)
 
 from DQM.TrackingMonitorClient.TrackingEffFromHitPatternClientConfig_cff import trackingEffFromHitPattern
 from DQM.TrackingMonitorClient.TrackingEffFromHitPatternClientConfigZeroBias_cff import trackingEffFromHitPatternZeroBias

diff --git a/DQM/TrackingMonitorSource/python/TrackCollections2monitor_cff.py b/DQM/TrackingMonitorSource/python/TrackCollections2monitor_cff.py
@@ -355,5 +355,5 @@
 #    if tracks != 'generalTracks':
 #        selectedTracks2runSequence+=sequenceName[tracks]
 
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
-pp_on_AA_2018.toModify(selectedTracks, func=lambda selectedTracks: selectedTracks.extend( ['hiConformalPixelTracksQA'] ))
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+pp_on_AA.toModify(selectedTracks, func=lambda selectedTracks: selectedTracks.extend( ['hiConformalPixelTracksQA'] ))
diff --git a/DQMOffline/Configuration/python/ALCARECOHcalCalDQM_cff.py b/DQMOffline/Configuration/python/ALCARECOHcalCalDQM_cff.py
@@ -17,10 +17,10 @@
 
 ALCARECOHcalCalHODQM =  DQMOffline.CalibCalo.MonitorHOAlCaRecoStream_cfi.MonitorHOAlCaRecoStream.clone()
 
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 
-pp_on_AA_2018.toModify(ALCARECOHcalCalPhisymDQM,
-                       hbheInputMB = "hbhereco",
-                       hoInputMB = "horeco"
+pp_on_AA.toModify(ALCARECOHcalCalPhisymDQM,
+                  hbheInputMB = "hbhereco",
+                  hoInputMB = "horeco"
 )
 
diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py
@@ -232,9 +232,9 @@
 run3_GEM.toReplaceWith(DQMOfflineMuon, _run3_GEM_DQMOfflineMuon)
 
 #Taus not created in pp conditions for HI
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 _DQMOfflineTAU = cms.Sequence()
-pp_on_AA_2018.toReplaceWith(DQMOfflineTAU, _DQMOfflineTAU)
+pp_on_AA.toReplaceWith(DQMOfflineTAU, _DQMOfflineTAU)
 
 
 # miniAOD DQM validation

diff --git a/DQMOffline/EGamma/python/egammaDQMOffline_cff.py b/DQMOffline/EGamma/python/egammaDQMOffline_cff.py
@@ -51,7 +51,7 @@
 )
 
 from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
-for e in [peripheralPbPb, pp_on_AA_2018, pp_on_XeXe_2017]:
+for e in [peripheralPbPb, pp_on_AA, pp_on_XeXe_2017]:
     e.toModify(stdPhotonAnalysis, phoProducer = cms.InputTag('islandPhotons'))
diff --git a/DQMOffline/JetMET/python/dataCertificationJetMET_cff.py b/DQMOffline/JetMET/python/dataCertificationJetMET_cff.py
@@ -6,6 +6,6 @@
 
 dataCertificationJetMETSequenceHI = cms.Sequence(qTesterJet + qTesterMET + dataCertificationJetMETHI)
 
-from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 
-pp_on_AA_2018.toReplaceWith( dataCertificationJetMETSequence, dataCertificationJetMETSequenceHI )
+pp_on_AA.toReplaceWith( dataCertificationJetMETSequence, dataCertificationJetMETSequenceHI )