From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/48061/head -> cms-sw/refs/pull/48061/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. Configuration/Eras/python/Era_Run3_2025_cff.py | 3 +- .../Eras/python/Modifier_run3_nanoAOD_2025_cff.py | 4 ++ .../Eras/python/Modifier_run3_nanoAOD_devel_cff.py | 4 ++ .../AMPT_PPb_5020GeV_MinimumBias_ExtGen_cfi.py | 57 ---------------------- .../Hydjet_Quenched_B12_5020GeV_ExtGen_cfi.py | 31 ------------ .../Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen_cfi.py | 36 -------------- ...PartonMC_EposLHC_4080_4080GeV_pPb_ExtGen_cfi.py | 17 ------- .../PyReleaseValidation/python/relval_nano.py | 24 ++++++++- .../PyReleaseValidation/python/relval_steps.py | 12 ++--- PhysicsTools/NanoAOD/python/muons_cff.py | 7 +++ PhysicsTools/NanoAOD/python/nano_eras_cff.py | 2 + ...alUncalibRecHitPhase2WeightsAlgoPortable.dev.cc | 5 ++ 12 files changed, 53 insertions(+), 149 deletions(-) create mode 100644 Configuration/Eras/python/Modifier_run3_nanoAOD_2025_cff.py create mode 100644 Configuration/Eras/python/Modifier_run3_nanoAOD_devel_cff.py delete mode 100644 Configuration/Generator/python/AMPT_PPb_5020GeV_MinimumBias_ExtGen_cfi.py delete mode 100644 Configuration/Generator/python/Hydjet_Quenched_B12_5020GeV_ExtGen_cfi.py delete mode 100644 Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen_cfi.py delete mode 100644 Configuration/Generator/python/ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_ExtGen_cfi.py Switched to branch 'from-CMSSW_15_1_X_2025-05-11-2300'