From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47701/head -> cms-sw/refs/pull/47701/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_CSC_2025_cff.py      |  4 ++
 .../python/cscTriggerPrimitiveDigis_cfi.py         |  8 ++-
 .../python/params/showerParams.py                  | 82 ++++++++++++++++++++++
 4 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 Configuration/Eras/python/Modifier_run3_CSC_2025_cff.py
Switched to branch 'from-CMSSW_15_1_X_2025-03-26-1100'