From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/48303/head -> cms-sw/refs/pull/48303/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 .../ForwardDetId/interface/HGCalTriggerDetId.h     |  3 ++
 .../interface/HGCalTriggerModuleDetId.h            | 12 ++++++
 .../modules/hltHGCalRecHitL1Seeded_cfi.py          |  7 ++++
 .../python/HLT_75e33/modules/hltHGCalRecHit_cfi.py |  7 ++++
 .../modules/hltHGCalUncalibRecHitL1Seeded_cfi.py   | 18 +++++++++
 .../HLT_75e33/modules/hltHGCalUncalibRecHit_cfi.py | 19 +++++++++
 .../HGCAL_chargeCollectionEfficiencies_cfi.py      |  5 ++-
 .../python/HLT_75e33/psets/HGCAL_noise_fC_cfi.py   |  5 ++-
 .../HLT_75e33/psets/hgcal_reco_constants_cfi.py    | 18 +++++++++
 .../python/HLT_75e33/psets/hgceeDigitizer_cfi.py   |  5 ++-
 .../HLT_75e33/psets/hgchebackDigitizer_cfi.py      |  5 ++-
 .../HLT_75e33/psets/hgchefrontDigitizer_cfi.py     |  5 ++-
 .../interface/HGCalCoarseTriggerCellMapping.h      |  2 +-
 L1Trigger/L1THGCal/interface/HGCalTriggerTools.h   |  4 +-
 .../concentrator/HGCalConcentratorCoarsenerImpl.h  |  1 -
 .../HGCalConcentratorProcessorSelection.h          |  1 -
 .../HGCalConcentratorSuperTriggerCellImpl.h        |  1 -
 .../interface/veryfrontend/HGCalVFESummationImpl.h |  2 +
 .../HGCalConcentratorProcessorSelection.cc         |  4 +-
 .../plugins/veryfrontend/HGCalVFEProcessorSums.cc  |  5 +--
 .../python/l1tHGCalConcentratorProducer_cfi.py     |  8 ++--
 .../L1THGCal/python/l1tHGCalVFEProducer_cfi.py     | 27 ++++++++-----
 L1Trigger/L1THGCal/src/HGCalTriggerTools.cc        | 46 ++++++++++++++++++++++
 .../concentrator/HGCalConcentratorCoarsenerImpl.cc |  4 +-
 .../HGCalConcentratorSuperTriggerCellImpl.cc       |  8 ++--
 .../src/veryfrontend/HGCalVFESummationImpl.cc      |  9 +++--
 RecoLocalCalo/HGCalRecAlgos/src/RecHitTools.cc     |  3 +-
 .../HGCalRecProducers/python/HGCalRecHit_cfi.py    |  5 +++
 .../python/HGCalUncalibRecHit_cfi.py               | 13 +++++-
 .../HGCalSimProducers/interface/HGCDigitizerBase.h | 22 ++++++-----
 .../HGCalSimProducers/interface/HGCFEElectronics.h |  4 +-
 .../HGCalSimProducers/plugins/HGCDigitizer.cc      |  2 +-
 .../HGCalSimProducers/plugins/HGCDigitizerBase.cc  |  6 +--
 .../python/hgcROCParameters_cfi.py                 |  4 ++
 .../HGCalSimProducers/python/hgcalDigitizer_cfi.py | 38 ++++++++++++++----
 .../HGCalSimProducers/src/HGCFEElectronics.cc      |  1 +
 36 files changed, 263 insertions(+), 66 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-06-30-2300'