From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47309/head -> cms-sw/refs/pull/47309/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 .../python/Era_Run2024_pp_on_PbPb_approxSiStripCluster.py  |  9 +++++++++
 Configuration/Eras/python/Run2024_pp_on_PbPb.py            |  8 ++++++++
 .../SiStripCluster/interface/SiStripApproximateCluster.h   | 14 ++++++++++----
 .../SiStripCluster/src/SiStripApproximateCluster.cc        |  7 +++++--
 DataFormats/SiStripCluster/src/SiStripCluster.cc           |  2 +-
 DataFormats/SiStripCluster/src/classes_def.xml             |  4 +++-
 6 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 Configuration/Eras/python/Era_Run2024_pp_on_PbPb_approxSiStripCluster.py
 create mode 100644 Configuration/Eras/python/Run2024_pp_on_PbPb.py
Switched to branch 'from-CMSSW_15_1_X_2025-02-10-1100'