Implemented 2024 era for pp reference and PbPb UPC

cms-sw · Mar 5, 2024 · 82d58a4 · 82d58a4
1 parent a3adc2d
commit 82d58a4
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 0 deletions.
diff --git a/Configuration/Eras/python/Era_Run3_2024_ppRef_cff.py b/Configuration/Eras/python/Era_Run3_2024_ppRef_cff.py
@@ -0,0 +1,8 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Run3_cff import Run3
+from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017
+from Configuration.Eras.Modifier_ppRef_2024_cff import ppRef_2024
+from Configuration.ProcessModifiers.storeZDCDigis_cff import storeZDCDigis
+
+Run3_2024_ppRef = cms.ModifierChain(Run3, ppRef_2017, ppRef_2024, storeZDCDigis)
diff --git a/Configuration/Eras/python/Era_Run3_UPC_cff.py b/Configuration/Eras/python/Era_Run3_UPC_cff.py
@@ -0,0 +1,8 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Run3_cff import Run3
+from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive
+from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018
+from Configuration.Eras.Modifier_run3_upc_cff import run3_upc
+
+Run3_UPC = cms.ModifierChain(Run3, egamma_lowPt_exclusive, highBetaStar_2018, run3_upc)
diff --git a/Configuration/Eras/python/Modifier_ppRef_2024_cff.py b/Configuration/Eras/python/Modifier_ppRef_2024_cff.py
@@ -0,0 +1,4 @@
+import FWCore.ParameterSet.Config as cms
+
+ppRef_2024 =  cms.Modifier()
+
diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py
@@ -46,6 +46,8 @@ def __init__(self):
                  'Run3_2023_FastSim',
                  'Run3_2023_ZDC',
                  'Run3_2023_UPC',
+                 'Run3_2024_ppRef',
+                 'Run3_UPC',
                  'Phase2',
                  'Phase2C9',
                  'Phase2C10',

diff --git a/Configuration/StandardSequences/python/Reconstruction_cff.py b/Configuration/StandardSequences/python/Reconstruction_cff.py
@@ -192,6 +192,8 @@
 _highlevelreco_HITask.add(hiClusterCompatibility)
 (pp_on_XeXe_2017 | pp_on_AA | run3_upc).toReplaceWith(highlevelrecoTask, _highlevelreco_HITask)
 pp_on_AA.toReplaceWith(highlevelrecoTask,highlevelrecoTask.copyAndExclude([PFTauTask]))
+from Configuration.Eras.Modifier_ppRef_2024_cff import ppRef_2024
+ppRef_2024.toReplaceWith(highlevelrecoTask, cms.Task(highlevelrecoTask.copy(), hiClusterCompatibility))
 
 # not commisoned and not relevant in FastSim (?):
 _fastSim_highlevelrecoTask = highlevelrecoTask.copyAndExclude([muoncosmichighlevelrecoTask])

diff --git a/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py b/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py
@@ -172,6 +172,14 @@
 from Configuration.Eras.Modifier_run3_upc_cff import run3_upc
 run3_upc.toModify(MicroEventContent, outputCommands = MicroEventContent.outputCommands + _upc_extraCommands)
 
+_ppRef_extraCommands = [
+    'keep floatedmValueMap_*TrackChi2_*_*',
+    'keep recoClusterCompatibility_hiClusterCompatibility_*_*',
+]
+
+from Configuration.Eras.Modifier_ppRef_2024_cff import ppRef_2024
+ppRef_2024.toModify(MicroEventContent, outputCommands = MicroEventContent.outputCommands + _ppRef_extraCommands)
+
 _zdc_extraCommands = ['keep QIE10DataFrameHcalDataFrameContainer_hcalDigis_ZDC_*']
 from Configuration.ProcessModifiers.storeZDCDigis_cff import storeZDCDigis
 storeZDCDigis.toModify(MicroEventContent, outputCommands = MicroEventContent.outputCommands + _zdc_extraCommands)

diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
@@ -126,6 +126,8 @@ def miniAOD_customizeCommon(process):
     pp_on_AA.toModify(process.selectedPatMuons, cut = "pt > 5 || isPFMuon || (pt > 1.2 && (isGlobalMuon || isStandAloneMuon) )")
     from Configuration.Eras.Modifier_run3_upc_cff import run3_upc
     run3_upc.toModify(process.selectedPatMuons, cut = "")
+    from Configuration.Eras.Modifier_ppRef_2024_cff import ppRef_2024
+    ppRef_2024.toModify(process.selectedPatMuons, cut = "pt > 5 || isPFMuon || isTrackerMuon || (pt > 1.2 && (isGlobalMuon || isStandAloneMuon))")
 
     process.selectedPatElectrons.cut = cms.string("")
     process.selectedPatTaus.cut = cms.string("pt > 18. && tauID('decayModeFindingNewDMs')> 0.5")

diff --git a/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py b/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py
@@ -125,3 +125,6 @@
 
 from Configuration.Eras.Modifier_run3_upc_cff import run3_upc
 run3_upc.toReplaceWith(slimmingTask, cms.Task(slimmingTask.copy(), hiPixelTracks, packedPFCandidateTrackChi2, lostTrackChi2))
+
+from Configuration.Eras.Modifier_ppRef_2024_cff import ppRef_2024
+ppRef_2024.toReplaceWith(slimmingTask, cms.Task(slimmingTask.copy(), packedPFCandidateTrackChi2, lostTrackChi2))
diff --git a/RecoJets/Configuration/python/RecoJets_EventContent_cff.py b/RecoJets/Configuration/python/RecoJets_EventContent_cff.py
@@ -53,6 +53,7 @@
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
 from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 from Configuration.Eras.Modifier_run3_upc_cff import run3_upc
+from Configuration.Eras.Modifier_ppRef_2024_cff import ppRef_2024
 #products from regular pp which does not fit the normal AOD
 for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017, pp_on_AA]:
     e.toModify( RecoJetsAOD.outputCommands, 
@@ -64,6 +65,10 @@
                                                                    'keep recoClusterCompatibility*_hiClusterCompatibility_*_*'
                                                                    ])
                 )
+for e in [ppRef_2024]:
+    e.toModify( RecoJetsAOD.outputCommands,
+                func=lambda outputCommands: outputCommands.extend(['keep recoClusterCompatibility*_hiClusterCompatibility_*_*'])
+                )
 #HI-specific products: needed in AOD, propagate to more inclusive tiers as well
 pA_2016.toModify( RecoJetsAOD.outputCommands, 
                   func=lambda outputCommands: outputCommands.extend(['keep recoCentrality*_pACentrality_*_*',