From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/48488/head -> cms-sw/refs/pull/48488/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. SimG4Core/CustomPhysics/interface/APrimePhysics.h | 2 +- SimG4Core/CustomPhysics/interface/CMSAPrime.h | 41 +++++++++++ SimG4Core/CustomPhysics/interface/CMSAntiSIMP.h | 4 +- SimG4Core/CustomPhysics/interface/CMSAntiSQ.h | 4 +- .../interface/CMSDarkPairProduction.h | 2 +- .../interface/CMSDarkPairProductionProcess.h | 2 +- SimG4Core/CustomPhysics/interface/CMSSQ.h | 5 +- .../interface/CMSSQInelasticCrossSection.h | 6 +- .../CustomPhysics/interface/CMSSQLoopProcess.h | 33 ++++----- .../interface/CMSSQLoopProcessDiscr.h | 19 +++-- ...kBremsstrahlung.h => CMSmuDarkBremsstrahlung.h} | 16 ++--- ...hlungModel.h => CMSmuDarkBremsstrahlungModel.h} | 22 +++--- .../CustomPhysics/interface/CustomPhysicsList.h | 6 +- .../CustomPhysics/interface/CustomPhysicsListSS.h | 6 +- .../{G4ProcessHelper.h => CustomProcessHelper.h} | 24 +++---- .../interface/FullModelHadronicProcess.h | 30 ++++---- .../interface/FullModelReactionDynamics.h | 9 +-- SimG4Core/CustomPhysics/interface/G4APrime.h | 41 ----------- SimG4Core/CustomPhysics/src/APrimePhysics.cc | 13 ++-- SimG4Core/CustomPhysics/src/CMSAPrime.cc | 80 +++++++++++++++++++++ .../CustomPhysics/src/CMSDarkPairProduction.cc | 2 - .../src/CMSDarkPairProductionProcess.cc | 2 - .../src/CMSSQInelasticCrossSection.cc | 2 - .../CustomPhysics/src/CMSmuDarkBremsstrahlung.cc | 44 ++++++++++++ ...ungModel.cc => CMSmuDarkBremsstrahlungModel.cc} | 59 +++++++-------- SimG4Core/CustomPhysics/src/CustomPhysicsList.cc | 25 ++++--- SimG4Core/CustomPhysics/src/CustomPhysicsListSS.cc | 21 +++--- .../{G4ProcessHelper.cc => CustomProcessHelper.cc} | 83 ++++++++-------------- .../CustomPhysics/src/FullModelHadronicProcess.cc | 80 +++++++++++++-------- .../CustomPhysics/src/FullModelReactionDynamics.cc | 49 +------------ SimG4Core/CustomPhysics/src/G4APrime.cc | 82 --------------------- .../CustomPhysics/src/G4muDarkBremsstrahlung.cc | 46 ------------ 32 files changed, 390 insertions(+), 470 deletions(-) create mode 100644 SimG4Core/CustomPhysics/interface/CMSAPrime.h rename SimG4Core/CustomPhysics/interface/{G4muDarkBremsstrahlung.h => CMSmuDarkBremsstrahlung.h} (53%) rename SimG4Core/CustomPhysics/interface/{G4muDarkBremsstrahlungModel.h => CMSmuDarkBremsstrahlungModel.h} (76%) rename SimG4Core/CustomPhysics/interface/{G4ProcessHelper.h => CustomProcessHelper.h} (81%) delete mode 100644 SimG4Core/CustomPhysics/interface/G4APrime.h create mode 100644 SimG4Core/CustomPhysics/src/CMSAPrime.cc create mode 100644 SimG4Core/CustomPhysics/src/CMSmuDarkBremsstrahlung.cc rename SimG4Core/CustomPhysics/src/{G4muDarkBremsstrahlungModel.cc => CMSmuDarkBremsstrahlungModel.cc} (87%) rename SimG4Core/CustomPhysics/src/{G4ProcessHelper.cc => CustomProcessHelper.cc} (80%) delete mode 100644 SimG4Core/CustomPhysics/src/G4APrime.cc delete mode 100644 SimG4Core/CustomPhysics/src/G4muDarkBremsstrahlung.cc Switched to branch 'from-CMSSW_15_1_X_2025-07-06-0000'