diff --git a/Configuration/Eras/python/Era_Run3_2025_UPC_OXY_cff.py b/Configuration/Eras/python/Era_Run3_2025_UPC_OXY_cff.py index cd0f47cb9cbab..e17523b6fed1e 100644 --- a/Configuration/Eras/python/Era_Run3_2025_UPC_OXY_cff.py +++ b/Configuration/Eras/python/Era_Run3_2025_UPC_OXY_cff.py @@ -2,5 +2,6 @@ from Configuration.Eras.Era_Run3_2025_UPC_cff import Run3_2025_UPC from Configuration.Eras.Modifier_run3_oxygen_cff import run3_oxygen +from Configuration.ProcessModifiers.rpdReco_cff import rpdReco -Run3_2025_UPC_OXY = cms.ModifierChain(Run3_2025_UPC, run3_oxygen) +Run3_2025_UPC_OXY = cms.ModifierChain(Run3_2025_UPC.copyAndExclude([rpdReco]), run3_oxygen) diff --git a/Configuration/Eras/python/Era_Run3_2025_UPC_cff.py b/Configuration/Eras/python/Era_Run3_2025_UPC_cff.py index 5cb0a600c08c2..9ea192e363842 100644 --- a/Configuration/Eras/python/Era_Run3_2025_UPC_cff.py +++ b/Configuration/Eras/python/Era_Run3_2025_UPC_cff.py @@ -2,9 +2,10 @@ from Configuration.Eras.Era_Run3_2025_cff import Run3_2025 from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +from Configuration.ProcessModifiers.rpdReco_cff import rpdReco from Configuration.Eras.Modifier_highBetaStar_cff import highBetaStar from Configuration.Eras.Modifier_dedx_lfit_cff import dedx_lfit from Configuration.Eras.Modifier_run3_upc_cff import run3_upc from Configuration.Eras.Modifier_run3_upc_2025_cff import run3_upc_2025 -Run3_2025_UPC = cms.ModifierChain(Run3_2025, egamma_lowPt_exclusive, highBetaStar, dedx_lfit, run3_upc, run3_upc_2025) +Run3_2025_UPC = cms.ModifierChain(Run3_2025, egamma_lowPt_exclusive, rpdReco, highBetaStar, dedx_lfit, run3_upc, run3_upc_2025) diff --git a/Configuration/Eras/python/Era_Run3_2026_UPC_cff.py b/Configuration/Eras/python/Era_Run3_2026_UPC_cff.py index 433b6fafe74f0..1ccc56078bbf8 100644 --- a/Configuration/Eras/python/Era_Run3_2026_UPC_cff.py +++ b/Configuration/Eras/python/Era_Run3_2026_UPC_cff.py @@ -2,9 +2,10 @@ from Configuration.Eras.Era_Run3_2026_cff import Run3_2026 from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive +from Configuration.ProcessModifiers.rpdReco_cff import rpdReco from Configuration.Eras.Modifier_highBetaStar_cff import highBetaStar from Configuration.Eras.Modifier_dedx_lfit_cff import dedx_lfit from Configuration.Eras.Modifier_run3_upc_cff import run3_upc from Configuration.Eras.Modifier_run3_upc_2026_cff import run3_upc_2026 -Run3_2026_UPC = cms.ModifierChain(Run3_2026, egamma_lowPt_exclusive, highBetaStar, dedx_lfit, run3_upc, run3_upc_2026) +Run3_2026_UPC = cms.ModifierChain(Run3_2026, egamma_lowPt_exclusive, rpdReco, highBetaStar, dedx_lfit, run3_upc, run3_upc_2026) diff --git a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2025_cff.py b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2025_cff.py index b10f94b27da63..c665985d474a2 100644 --- a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2025_cff.py +++ b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2025_cff.py @@ -2,8 +2,9 @@ from Configuration.Eras.Era_Run3_2025_cff import Run3_2025 from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +from Configuration.ProcessModifiers.rpdReco_cff import rpdReco from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 from Configuration.Eras.Modifier_pp_on_PbPb_run3_2025_cff import pp_on_PbPb_run3_2025 from Configuration.Eras.Modifier_dedx_lfit_cff import dedx_lfit -Run3_pp_on_PbPb_2025 = cms.ModifierChain(Run3_2025, dedx_lfit, pp_on_AA, pp_on_PbPb_run3, pp_on_PbPb_run3_2025) +Run3_pp_on_PbPb_2025 = cms.ModifierChain(Run3_2025, dedx_lfit, pp_on_AA, rpdReco, pp_on_PbPb_run3, pp_on_PbPb_run3_2025) diff --git a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2026_cff.py b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2026_cff.py index fc0996ce9bf5f..111bdfc39603e 100644 --- a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2026_cff.py +++ b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2026_cff.py @@ -2,8 +2,9 @@ from Configuration.Eras.Era_Run3_2026_cff import Run3_2026 from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +from Configuration.ProcessModifiers.rpdReco_cff import rpdReco from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 from Configuration.Eras.Modifier_pp_on_PbPb_run3_2026_cff import pp_on_PbPb_run3_2026 from Configuration.Eras.Modifier_dedx_lfit_cff import dedx_lfit -Run3_pp_on_PbPb_2026 = cms.ModifierChain(Run3_2026, dedx_lfit, pp_on_AA, pp_on_PbPb_run3, pp_on_PbPb_run3_2026) +Run3_pp_on_PbPb_2026 = cms.ModifierChain(Run3_2026, dedx_lfit, pp_on_AA, rpdReco, pp_on_PbPb_run3, pp_on_PbPb_run3_2026) diff --git a/Configuration/ProcessModifiers/python/rpdReco_cff.py b/Configuration/ProcessModifiers/python/rpdReco_cff.py new file mode 100644 index 0000000000000..924130a583530 --- /dev/null +++ b/Configuration/ProcessModifiers/python/rpdReco_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +rpdReco = cms.Modifier() diff --git a/RecoLocalCalo/HcalRecProducers/plugins/ZdcHitReconstructor_Run3.cc b/RecoLocalCalo/HcalRecProducers/plugins/ZdcHitReconstructor_Run3.cc index 649cec23d2dcd..017e0ff7f1684 100644 --- a/RecoLocalCalo/HcalRecProducers/plugins/ZdcHitReconstructor_Run3.cc +++ b/RecoLocalCalo/HcalRecProducers/plugins/ZdcHitReconstructor_Run3.cc @@ -231,10 +231,10 @@ void ZdcHitReconstructor_Run3::fillDescriptions(edm::ConfigurationDescriptions& psd0.add("maxADCvalue", 255); desc.add("saturationParameters", psd0); } - descriptions.add("zdcrecoRun3", desc); + descriptions.add("zdcRecoRun3", desc); // or use the following to generate the label from the module's C++ type //descriptions.addWithDefaultLabel(desc); } //define this as a plug-in -DEFINE_FWK_MODULE(ZdcHitReconstructor_Run3); \ No newline at end of file +DEFINE_FWK_MODULE(ZdcHitReconstructor_Run3); diff --git a/RecoLocalCalo/HcalRecProducers/python/zdcrecoRun3_cfi.py b/RecoLocalCalo/HcalRecProducers/python/zdcrecoRun3_cfi.py new file mode 100644 index 0000000000000..2681045131e8a --- /dev/null +++ b/RecoLocalCalo/HcalRecProducers/python/zdcrecoRun3_cfi.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms +import RecoLocalCalo.HcalRecProducers.zdcRecoRun3_cfi +# clone (new) zdcrecoRun3 from imtermediate zdcRecoRun3 +zdcrecoRun3 = RecoLocalCalo.HcalRecProducers.zdcRecoRun3_cfi.zdcRecoRun3.clone() +# apply modifier(s) +from Configuration.ProcessModifiers.rpdReco_cff import rpdReco +rpdReco.toModify(zdcrecoRun3, skipRPD = False)