From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/48009/head -> cms-sw/refs/pull/48009/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 .../ProcessModifiers/python/fastSimPU_cff.py       |   3 +
 .../EcalSimProducers/interface/EcalDigiProducer.h  |  20 +--
 .../EcalSimProducers/src/EcalDigiProducer.cc       | 147 ++++++++++++---------
 .../HcalSimProducers/interface/HcalDigitizer.h     |  13 +-
 .../python/hcalUnsuppressedDigis_cfi.py            |   9 +-
 .../HcalSimProducers/src/HcalDigitizer.cc          |  40 ++++--
 SimGeneral/MixingModule/plugins/MixingModule.cc    |  23 +---
 SimGeneral/MixingModule/plugins/MixingModule.h     |   1 +
 SimGeneral/MixingModule/plugins/MixingWorker.cc    |   1 +
 SimGeneral/MixingModule/plugins/MixingWorker.h     |   2 +-
 SimGeneral/MixingModule/plugins/MixingWorkerBase.h |   1 +
 .../python/SiPixelSimParameters_cfi.py             |  13 ++
 .../python/SiStripSimParameters_cfi.py             |  12 ++
 .../MixingModule/python/ecalDigitizer_cfi.py       |  11 +-
 SimGeneral/MixingModule/python/mixObjects_cfi.py   |  33 ++++-
 .../mix_probFunction_25ns_PoissonOOTPU_cfi.py      |   4 +-
 .../MixingModule/python/pixelDigitizer_cfi.py      |   9 ++
 .../MixingModule/python/stripDigitizer_cfi.py      |   9 ++
 .../python/trackingTruthProducer_cfi.py            |  44 +++++-
 .../plugins/TrackingTruthAccumulator.cc            |  32 ++++-
 .../plugins/TrackingTruthAccumulator.h             |   8 +-
 SimMuon/CSCDigitizer/python/muonCSCDigis_cfi.py    |   9 +-
 SimMuon/CSCDigitizer/src/CSCDigiProducer.cc        |  36 +++--
 SimMuon/CSCDigitizer/src/CSCDigiProducer.h         |   2 +-
 SimMuon/DTDigitizer/python/muonDTDigis_cfi.py      |   9 +-
 SimMuon/DTDigitizer/src/DTDigitizer.cc             |  31 +++--
 SimMuon/DTDigitizer/src/DTDigitizer.h              |   6 +-
 SimMuon/GEMDigitizer/plugins/GEMDigiProducer.cc    |  36 +++--
 SimMuon/GEMDigitizer/python/muonGEMDigis_cfi.py    |   4 +
 SimMuon/RPCDigitizer/python/muonRPCDigis_cfi.py    |   9 +-
 SimMuon/RPCDigitizer/src/RPCDigiProducer.cc        |  29 ++--
 SimMuon/RPCDigitizer/src/RPCDigiProducer.h         |   6 +-
 .../SiPixelDigitizer/plugins/SiPixelDigitizer.cc   |  95 +++++++------
 .../SiPixelDigitizer/plugins/SiPixelDigitizer.h    |   4 +-
 .../SiStripDigitizer/plugins/SiStripDigitizer.cc   |  87 ++++++++----
 .../SiStripDigitizer/plugins/SiStripDigitizer.h    |   8 +-
 36 files changed, 547 insertions(+), 259 deletions(-)
 create mode 100644 Configuration/ProcessModifiers/python/fastSimPU_cff.py
Switched to branch 'from-CMSSW_15_1_FASTPU_X_2025-05-14-2300'