From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47945/head -> cms-sw/refs/pull/47945/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 Configuration/Applications/python/ConfigBuilder.py |   2 +-
 .../python/AMPT_PPb_5020GeV_MinimumBias_cfi.py     |   5 +-
 .../Generator/python/Hijing_PPb_MinimumBias_cfi.py |   5 +-
 .../python/Hydjet2_Quenched_MinBias_5020GeV_cfi.py |   5 +-
 .../python/Hydjet_Quenched_B12_5020GeV_cfi.py      |  20 +-
 .../python/Hydjet_Quenched_B12_5362GeV_cfi.py      |  20 +-
 .../python/Hydjet_Quenched_MinBias_2760GeV_cfi.py  |  22 +-
 .../python/Hydjet_Quenched_MinBias_5020GeV_cfi.py  |  20 +-
 .../python/Hydjet_Quenched_MinBias_5362GeV_cfi.py  |  20 +-
 .../python/Hydjet_Quenched_MinBias_5519GeV_cfi.py  |  20 +-
 .../Hydjet_Quenched_MinBias_XeXe_5442GeV_cfi.py    | 154 +-----
 ...15Settings_cff.py => Pyquen2025Settings_cff.py} | 188 +++++---
 .../Generator/python/PyquenDefaultSettings_cff.py  | 254 ----------
 .../python/Pyquen_DiJet_pt80to120_2760GeV_cfi.py   |  38 +-
 .../python/Pyquen_DiJet_pt80to120_5362GeV_cfi.py   |  38 +-
 .../python/Pyquen_GammaJet_pt20_2760GeV_cfi.py     |  14 +-
 .../python/Pyquen_GammaJet_pt20_5362GeV_cfi.py     |  14 +-
 .../python/Pyquen_ZeemumuJets_pt10_2760GeV_cfi.py  |  14 +-
 .../python/Pyquen_ZeemumuJets_pt10_5362GeV_cfi.py  |  14 +-
 ...eGribovPartonMC_EposLHC_4080_4080GeV_pPb_cfi.py |   6 +-
 .../HydjetInterface/interface/HydjetHadronizer.h   |  19 +-
 .../python/hydjetDefaultParameters_cff.py          | 168 +++++--
 .../HydjetInterface/python/hydjetDefault_cfi.py    |  28 +-
 .../HydjetInterface/test/testHydjet.py             |  17 +-
 .../scripts/gamma-UPC_lhe_ktsmearing_UPC.py        | 515 +++++++++++++++++++++
 ...alUncalibRecHitPhase2WeightsAlgoPortable.dev.cc |   4 +-
 26 files changed, 1026 insertions(+), 598 deletions(-)
 rename Configuration/Generator/python/{Pyquen2015Settings_cff.py => Pyquen2025Settings_cff.py} (60%)
 delete mode 100644 Configuration/Generator/python/PyquenDefaultSettings_cff.py
 create mode 100755 GeneratorInterface/LHEInterface/scripts/gamma-UPC_lhe_ktsmearing_UPC.py
Switched to branch 'from-CMSSW_15_1_X_2025-04-24-1100'