PPS: update of era modifiers

Configuration/Eras/python/Era_Run2_2016_cff.py

@@ -3,6 +3,7 @@
 from Configuration.Eras.Modifier_run2_common_cff import run2_common
 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_cff import ctpps
 from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
 from Configuration.Eras.Modifier_run2_HLTconditions_2016_cff import run2_HLTconditions_2016
 from Configuration.Eras.Modifier_run2_muon_2016_cff import run2_muon_2016
@@ -14,5 +15,5 @@
 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_ECAL_2016, run2_muon_2016, run2_egamma_2016, run2_L1prefiring, pixel_2016, run2_jme_2016, strips_vfp30_2016)
+ stage2L1Trigger, ctpps, ctpps_2016, run2_HLTconditions_2016, run2_ECAL_2016, run2_muon_2016, run2_egamma_2016, run2_L1prefiring, pixel_2016, run2_jme_2016, strips_vfp30_2016)
 

Configuration/Eras/python/Era_Run2_2017_cff.py

@@ -17,13 +17,14 @@
 from Configuration.Eras.Modifier_run2_muon_2016_cff import run2_muon_2016
 from Configuration.Eras.Modifier_run2_egamma_2017_cff import run2_egamma_2017
 from Configuration.Eras.Modifier_run2_egamma_2016_cff import run2_egamma_2016
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
 from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017
 from Configuration.Eras.Modifier_pixel_2016_cff import pixel_2016
 from Configuration.Eras.Modifier_run2_jme_2017_cff import run2_jme_2017
 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_ECAL_2016, run2_egamma_2016,pixel_2016,run2_jme_2016, strips_vfp30_2016]),
+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, ctpps_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)
 

Configuration/Eras/python/Modifier_ctpps_cff.py

@@ -0,0 +1,4 @@
+import FWCore.ParameterSet.Config as cms
+
+ctpps =  cms.Modifier()
+

Configuration/EventContent/python/EventContent_cff.py

@@ -212,7 +212,7 @@ def SwapKeepAndDrop(l):
 RECOEventContent.outputCommands.extend(CommonEventContent.outputCommands)
 RECOEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands)
 
-from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+from Configuration.Eras.Modifier_ctpps_cff import ctpps
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
 from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon
@@ -223,7 +223,7 @@ def SwapKeepAndDrop(l):
 from RecoLocalFastTime.Configuration.RecoLocalFastTime_EventContent_cff import *
 from RecoMTD.Configuration.RecoMTD_EventContent_cff import *
 
-ctpps_2016.toModify(RECOEventContent, 
+ctpps.toModify(RECOEventContent, 
     outputCommands = RECOEventContent.outputCommands + RecoCTPPSRECO.outputCommands)
 phase2_hgcal.toModify(RECOEventContent,
     outputCommands = RECOEventContent.outputCommands + TICL_RECO.outputCommands)
@@ -276,7 +276,7 @@ def SwapKeepAndDrop(l):
 AODEventContent.outputCommands.extend(TcdsEventContent.outputCommands)
 AODEventContent.outputCommands.extend(CommonEventContent.outputCommands)
 
-ctpps_2016.toModify(AODEventContent, 
+ctpps.toModify(AODEventContent, 
     outputCommands = AODEventContent.outputCommands + RecoCTPPSAOD.outputCommands)
 phase2_hgcal.toModify(AODEventContent,
     outputCommands = AODEventContent.outputCommands + TICL_AOD.outputCommands)
@@ -486,7 +486,7 @@ def SwapKeepAndDrop(l):
 FEVTEventContent.outputCommands.extend(CommonEventContent.outputCommands)
 FEVTEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands)
 
-ctpps_2016.toModify(FEVTEventContent, 
+ctpps.toModify(FEVTEventContent, 
     outputCommands = FEVTEventContent.outputCommands + RecoCTPPSFEVT.outputCommands)
 phase2_hgcal.toModify(FEVTEventContent,
     outputCommands = FEVTEventContent.outputCommands + TICL_FEVT.outputCommands)

Configuration/StandardSequences/python/Eras.py

@@ -66,7 +66,7 @@ def __init__(self):
                            'phase2_timing_layer', 'phase2_hcal', 'phase2_ecal','phase2_ecal_devel',
                            'phase2_trigger',
                            'phase2_squarePixels', 'phase2_3DPixels',
-                           'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'ctpps_2021', 'trackingPhase2PU140','highBetaStar_2018',
+                           'trackingLowPU', 'trackingPhase1', 'ctpps', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'ctpps_2021', 'trackingPhase2PU140','highBetaStar_2018',
                            'tracker_apv_vfp30_2016', 'pf_badHcalMitigation', 'run2_miniAOD_80XLegacy','run2_miniAOD_94XFall17', 'run2_nanoAOD_92X',
                            'run2_nanoAOD_94XMiniAODv1', 'run2_nanoAOD_94XMiniAODv2', 'run2_nanoAOD_94X2016',
                            'run2_miniAOD_devel', 'run2_nanoAOD_102Xv1', 'run2_nanoAOD_106Xv1', 'run2_nanoAOD_106Xv2',

Configuration/StandardSequences/python/RawToDigi_cff.py

@@ -92,15 +92,15 @@
 
 
 # add CTPPS 2016 raw-to-digi modules
-from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+from Configuration.Eras.Modifier_ctpps_cff import ctpps
 
-_ctpps_2016_RawToDigiTask = RawToDigiTask.copy()
-_ctpps_2016_RawToDigiTask.add(ctppsRawToDigiTask)
-ctpps_2016.toReplaceWith(RawToDigiTask, _ctpps_2016_RawToDigiTask)
+_ctpps_RawToDigiTask = RawToDigiTask.copy()
+_ctpps_RawToDigiTask.add(ctppsRawToDigiTask)
+ctpps.toReplaceWith(RawToDigiTask, _ctpps_RawToDigiTask)
 
-_ctpps_2016_RawToDigiTask_noTk = RawToDigiTask_noTk.copy()
-_ctpps_2016_RawToDigiTask_noTk.add(ctppsRawToDigiTask)
-ctpps_2016.toReplaceWith(RawToDigiTask_noTk, _ctpps_2016_RawToDigiTask_noTk)
+_ctpps_RawToDigiTask_noTk = RawToDigiTask_noTk.copy()
+_ctpps_RawToDigiTask_noTk.add(ctppsRawToDigiTask)
+ctpps.toReplaceWith(RawToDigiTask_noTk, _ctpps_RawToDigiTask_noTk)
 
 # GEM settings
 _gem_RawToDigiTask = RawToDigiTask.copy()

Configuration/StandardSequences/python/Reconstruction_cff.py

@@ -75,14 +75,15 @@
 phase2_timing_layer.toReplaceWith(localrecoTask,_phase2_timing_layer_localrecoTask)
 phase2_timing_layer.toReplaceWith(localreco_HcalNZSTask,_phase2_timing_layer_localreco_HcalNZSTask)
 
-_ctpps_2016_localrecoTask = localrecoTask.copy()
-_ctpps_2016_localrecoTask.add(recoCTPPSTask)
-from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
-ctpps_2016.toReplaceWith(localrecoTask, _ctpps_2016_localrecoTask)
-
-_ctpps_2016_localreco_HcalNZSTask = localreco_HcalNZSTask.copy()
-_ctpps_2016_localreco_HcalNZSTask.add(recoCTPPSTask)
-ctpps_2016.toReplaceWith(localreco_HcalNZSTask, _ctpps_2016_localreco_HcalNZSTask)
+from Configuration.Eras.Modifier_ctpps_cff import ctpps
+
+_ctpps_localrecoTask = localrecoTask.copy()
+_ctpps_localrecoTask.add(recoCTPPSTask)
+ctpps.toReplaceWith(localrecoTask, _ctpps_localrecoTask)
+
+_ctpps_localreco_HcalNZSTask = localreco_HcalNZSTask.copy()
+_ctpps_localreco_HcalNZSTask.add(recoCTPPSTask)
+ctpps.toReplaceWith(localreco_HcalNZSTask, _ctpps_localreco_HcalNZSTask)
 
 ###########################################
 # no castor, zdc, Totem/CTPPS RP in FastSim

DQM/CTPPS/python/ctppsDQM_cff.py

@@ -60,19 +60,19 @@
 )
 
 # the actually used sequences must be empty for pre-PPS data
-from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+from Configuration.Eras.Modifier_ctpps_cff import ctpps
 
 ctppsDQMOnlineSource = cms.Sequence()
 ctppsDQMOnlineHarvest = cms.Sequence()
-ctpps_2016.toReplaceWith(ctppsDQMOnlineSource, _ctppsDQMOnlineSource)
-ctpps_2016.toReplaceWith(ctppsDQMOnlineHarvest, _ctppsDQMOnlineHarvest)
+ctpps.toReplaceWith(ctppsDQMOnlineSource, _ctppsDQMOnlineSource)
+ctpps.toReplaceWith(ctppsDQMOnlineHarvest, _ctppsDQMOnlineHarvest)
 
 ctppsDQMCalibrationSource = cms.Sequence()
 ctppsDQMCalibrationHarvest = cms.Sequence()
-ctpps_2016.toReplaceWith(ctppsDQMCalibrationSource, _ctppsDQMCalibrationSource)
-ctpps_2016.toReplaceWith(ctppsDQMCalibrationHarvest, _ctppsDQMCalibrationHarvest)
+ctpps.toReplaceWith(ctppsDQMCalibrationSource, _ctppsDQMCalibrationSource)
+ctpps.toReplaceWith(ctppsDQMCalibrationHarvest, _ctppsDQMCalibrationHarvest)
 
 ctppsDQMOfflineSource = cms.Sequence()
 ctppsDQMOfflineHarvest = cms.Sequence()
-ctpps_2016.toReplaceWith(ctppsDQMOfflineSource, _ctppsDQMOfflineSource)
-ctpps_2016.toReplaceWith(ctppsDQMOfflineHarvest, _ctppsDQMOfflineHarvest)
+ctpps.toReplaceWith(ctppsDQMOfflineSource, _ctppsDQMOfflineSource)
+ctpps.toReplaceWith(ctppsDQMOfflineHarvest, _ctppsDQMOfflineHarvest)

DQM/CTPPS/test/all_ctpps_dqm_test_from_aod_cfg.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
-process = cms.Process('ctppsDQMfromAOD', ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_cff import ctpps
+process = cms.Process('ctppsDQMfromAOD', ctpps)
 
 # minimum of logs
 process.MessageLogger = cms.Service("MessageLogger",

DQM/CTPPS/test/all_ctpps_dqm_test_from_dat_cfg.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
-process = cms.Process('ctppsDQMfromRAW', ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_cff import ctpps
+process = cms.Process('ctppsDQMfromRAW', ctpps)
 
 # minimum of logs
 process.MessageLogger = cms.Service("MessageLogger",

DQM/CTPPS/test/all_ctpps_dqm_test_from_raw_cfg.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
-process = cms.Process('ctppsDQMfromRAW', ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_cff import ctpps
+process = cms.Process('ctppsDQMfromRAW', ctpps)
 
 # minimum of logs
 process.MessageLogger = cms.Service("MessageLogger",

PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py

@@ -628,9 +628,9 @@ def miniAOD_customizeData(process):
     process.load("Geometry.VeryForwardGeometry.geometryRPFromDB_cfi")
     process.load('L1Trigger.L1TGlobal.simGtExtFakeProd_cfi')
     task = getPatAlgosToolsTask(process)
-    from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
-    ctpps_2016.toModify(task, func=lambda t: t.add(process.ctppsLocalTrackLiteProducer))
-    ctpps_2016.toModify(task, func=lambda t: t.add(process.ctppsProtons))
+    from Configuration.Eras.Modifier_ctpps_cff import ctpps
+    ctpps.toModify(task, func=lambda t: t.add(process.ctppsLocalTrackLiteProducer))
+    ctpps.toModify(task, func=lambda t: t.add(process.ctppsProtons))
     from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
     run2_miniAOD_UL.toModify(task, func=lambda t: t.add(process.simGtExtUnprefireable))
 

RecoPPS/Configuration/test/raw_data_test.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
-process = cms.Process("CTPPSReconstructionChainTest", ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_cff import ctpps
+process = cms.Process("CTPPSReconstructionChainTest", ctpps)
 
 # minimum of logs
 process.MessageLogger = cms.Service("MessageLogger",

RecoPPS/Local/plugins/CTPPSLocalTrackLiteProducer.cc

@@ -238,7 +238,7 @@ void CTPPSLocalTrackLiteProducer::fillDescriptions(edm::ConfigurationDescription
   edm::ParameterSetDescription desc;
 
   // By default: all includeXYZ flags set to false.
-  // The includeXYZ are switched on when the "ctpps_2016" era is declared in
+  // The includeXYZ are switched on when the "ctpps" era modifier is declared in
   // python config, see:
   // RecoPPS/Local/python/ctppsLocalTrackLiteProducer_cff.py
 

RecoPPS/Local/python/ctppsLocalTrackLiteProducer_cff.py

@@ -5,8 +5,8 @@
 ctppsLocalTrackLiteProducer = ctppsLocalTrackLiteDefaultProducer.clone()
 
 # enable the module for CTPPS era(s)
-from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
-ctpps_2016.toModify(
+from Configuration.Eras.Modifier_ctpps_cff import ctpps
+ctpps.toModify(
     ctppsLocalTrackLiteProducer,
     includeStrips = True,
     includeDiamonds = True,

RecoPPS/ProtonReconstruction/python/ctppsProtons_cff.py

@@ -10,7 +10,7 @@
 from RecoPPS.ProtonReconstruction.ctppsProtons_cfi import *
 ctppsProtons.lhcInfoLabel = ctppsLHCInfoLabel
 
-from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+from Configuration.Eras.Modifier_ctpps_cff import ctpps
 from Configuration.Eras.Modifier_ctpps_2017_cff import ctpps_2017
 from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018
 
@@ -34,7 +34,7 @@ def applyDefaultSettings(ctppsProtons):
   ctppsProtons.pixelDiscardBXShiftedTracks = True
   ctppsProtons.default_time = -999.
 
-ctpps_2016.toModify(ctppsProtons, applyDefaultSettings) # applied for all Run2 years (2016, 2017 and 2018)
+ctpps.toModify(ctppsProtons, applyDefaultSettings)
 
 def apply2017Settings(ctppsProtons):
   ctppsProtons.association_cuts_45.x_cut_apply = False