From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47630/head -> cms-sw/refs/pull/47630/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 CondCore/ESSources/plugins/CondDBESSource.cc       |   120 +-
 CondCore/ESSources/plugins/CondDBESSource.h        |     4 +
 CondCore/ESSources/python/CondDBESSource_cfi.py    |    30 +-
 Configuration/AlCa/python/autoCond.py              |     8 +-
 Configuration/Geometry/python/dict2021Geometry.py  |   141 +-
 EventFilter/HGCalRawToDigi/src/UnpackerTools.cc    |     2 +-
 FWCore/PluginManager/src/PluginFactoryBase.cc      |     4 +-
 .../data/dd4hep/cmsExtendedGeometry2021.xml        |     4 +-
 .../data/dd4hep/cmsExtendedGeometry2023.xml        |     4 +-
 .../data/dd4hep/cmsExtendedGeometry2024.xml        |     4 +-
 .../python/cmsExtendedGeometry2021XML_cfi.py       |     4 +-
 .../python/cmsExtendedGeometry2023XML_cfi.py       |     4 +-
 .../python/cmsExtendedGeometry2024XML_cfi.py       |     4 +-
 .../python/testExtendedGeometry2021NXML_cfi.py     |     4 +-
 .../python/testExtendedGeometry2023NXML_cfi.py     |     4 +-
 .../python/testExtendedGeometry2024NXML_cfi.py     |     4 +-
 HLTrigger/Configuration/python/HLT_2024v14_cff.py  |    40 +-
 .../hltTiclTrackstersCLUE3DHighL1Seeded_cfi.py     |     2 +-
 .../modules/hltTiclTrackstersCLUE3DHigh_cfi.py     |     2 +-
 HLTrigger/Configuration/python/HLT_FULL_cff.py     |  2377 +--
 HLTrigger/Configuration/python/HLT_Fake1_cff.py    |     9 +-
 HLTrigger/Configuration/python/HLT_Fake2_cff.py    |     9 +-
 HLTrigger/Configuration/python/HLT_Fake_cff.py     |     9 +-
 HLTrigger/Configuration/python/HLT_GRun_cff.py     | 15902 +++++++------------
 HLTrigger/Configuration/python/HLT_HIon_cff.py     |   190 +-
 HLTrigger/Configuration/python/HLT_PIon_cff.py     |   183 +-
 HLTrigger/Configuration/python/HLT_PRef_cff.py     |   200 +-
 HLTrigger/Configuration/python/HLT_Special_cff.py  |   222 +-
 .../python/HLTrigger_Datasets_GRun_cff.py          |   152 +-
 .../Configuration/python/customizeHLTforCMSSW.py   |    47 +-
 .../Configuration/scripts/utils/hltPathOwners.json |     3 +-
 HLTrigger/Configuration/tables/GRun.txt            |    29 +-
 HLTrigger/Configuration/tables/Special.txt         |     3 +-
 HLTrigger/Configuration/tables/online_Cosmics.txt  |     2 +-
 .../tables/online_FirstCollisions.txt              |     6 +
 HLTrigger/Configuration/tables/online_Special.txt  |     8 +-
 HLTrigger/Configuration/tables/online_grun.txt     |    29 +-
 HLTrigger/Configuration/test/OnLine_HLT_2024v14.py |    40 +-
 HLTrigger/Configuration/test/OnLine_HLT_FULL.py    |  2488 +--
 HLTrigger/Configuration/test/OnLine_HLT_Fake.py    |     9 +-
 HLTrigger/Configuration/test/OnLine_HLT_Fake1.py   |     9 +-
 HLTrigger/Configuration/test/OnLine_HLT_Fake2.py   |     9 +-
 HLTrigger/Configuration/test/OnLine_HLT_GRun.py    | 15470 +++++++-----------
 HLTrigger/Configuration/test/OnLine_HLT_HIon.py    |   190 +-
 HLTrigger/Configuration/test/OnLine_HLT_PIon.py    |   183 +-
 HLTrigger/Configuration/test/OnLine_HLT_PRef.py    |   200 +-
 HLTrigger/Configuration/test/OnLine_HLT_Special.py |   264 +-
 RecoHGCal/TICL/interface/TracksterInferenceByDNN.h |     4 +-
 RecoHGCal/TICL/interface/TracksterInferenceByPFN.h |     4 +-
 RecoHGCal/TICL/plugins/TracksterInferenceByDNN.cc  |    22 +-
 RecoHGCal/TICL/plugins/TracksterInferenceByPFN.cc  |    23 +-
 RecoHGCal/TICL/python/CLUE3DHighStep_cff.py        |     2 +-
 SimG4Core/Application/src/ExceptionHandler.cc      |     2 +-
 SimG4Core/Application/src/RunManagerMT.cc          |     4 +
 SimG4Core/Application/src/RunManagerMTWorker.cc    |     3 +-
 SimG4Core/Application/src/TrackingAction.cc        |     2 +-
 .../CustomPhysics/src/FullModelReactionDynamics.cc |     3 +-
 SimG4Core/GeometryProducer/src/GeometryProducer.cc |     5 +
 .../interface/CMSG4TrackInterface.h                |     4 +-
 .../src/CMSG4TrackInterface.cc                     |     2 +-
 .../PhysicsLists/interface/CMSEmStandardPhysics.h  |     2 +-
 SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM.cc |     9 +-
 .../PhysicsLists/plugins/FTFPCMS_BERT_HP_EMM.cc    |     8 +-
 .../PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMM.cc  |     4 +-
 SimG4Core/PhysicsLists/src/CMSEmStandardPhysics.cc |     8 +-
 65 files changed, 12605 insertions(+), 26137 deletions(-)
 rename SimG4Core/{Application => Physics}/interface/CMSG4TrackInterface.h (94%)
 rename SimG4Core/{Application => Physics}/src/CMSG4TrackInterface.cc (85%)
Switched to branch 'from-CMSSW_15_1_X_2025-03-20-2300'