From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47682/head -> cms-sw/refs/pull/47682/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 .../plugins/ShallowGainCalibration.cc              |  2 +-
 .../TkAlCaRecoProducers/src/AlcaBeamSpotManager.cc |  3 +-
 CondCore/CondDB/src/ConnectionPool.cc              |  2 +-
 CondCore/ESSources/plugins/CondDBESSource.cc       |  2 +-
 CondFormats/RPCObjects/src/RPCReadOutMapping.cc    |  2 +-
 .../ProcessModifiers/python/enableCPfromPU_cff.py  |  4 +++
 .../python/upgradeWorkflowComponents.py            | 32 ++++++++++++++++++++++
 .../python/hgcHitAssociation_cfi.py                | 12 ++++++--
 SimDataFormats/Track/src/classes_def.xml           | 20 +++++---------
 9 files changed, 58 insertions(+), 21 deletions(-)
 create mode 100644 Configuration/ProcessModifiers/python/enableCPfromPU_cff.py
Switched to branch 'from-CMSSW_15_1_X_2025-03-25-2300'