From . * [new ref] -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/46325/head -> cms-sw/refs/pull/46325/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. Configuration/AlCa/python/autoCond.py | 2 +- Configuration/Eras/python/Era_Run2_2016_UPC_cff.py | 8 + .../Eras/python/Era_Run2_2018_highBetaStar_cff.py | 4 +- Configuration/Eras/python/Era_Run3_2023_UPC_cff.py | 4 +- Configuration/Eras/python/Era_Run3_2024_UPC_cff.py | 4 +- ...ar_2018_cff.py => Modifier_highBetaStar_cff.py} | 2 +- .../PyReleaseValidation/python/relval_standard.py | 3 + .../PyReleaseValidation/python/relval_steps.py | 5 + Configuration/StandardSequences/python/Eras.py | 3 +- .../StandardSequences/python/Reconstruction_cff.py | 2 +- PhysicsTools/CondLiteIO/src/RecordWriter.cc | 6 +- PhysicsTools/MVAComputer/src/Spline.cc | 2 +- .../PatAlgos/plugins/DeDxEstimatorRekeyer.cc | 4 +- PhysicsTools/UtilAlgos/src/CachingVariable.cc | 5 +- .../python/HILowPtConformalPixelTracks_cfi.py | 6 +- .../python/DetachedQuadStep_cff.py | 8 +- .../python/DetachedTripletStep_cff.py | 8 +- .../python/HighPtTripletStep_cff.py | 12 +- .../IterativeTracking/python/InitialStep_cff.py | 8 +- .../IterativeTracking/python/LowPtQuadStep_cff.py | 8 +- .../python/LowPtTripletStep_cff.py | 8 +- .../python/MixedTripletStep_cff.py | 17 +- .../IterativeTracking/python/PixelPairStep_cff.py | 14 +- .../MkFit/plugins/MkFitGeometryESProducer.cc | 68 +- RecoTracker/MkFit/plugins/MkFitOutputConverter.cc | 117 +- RecoTracker/MkFit/test/dumpMkFitGeometry.py | 2 +- RecoTracker/MkFit/test/dumpMkFitGeometryPhase2.py | 20 +- RecoTracker/MkFitCMS/interface/MkStdSeqs.h | 1 + RecoTracker/MkFitCMS/src/MkStdSeqs.cc | 2 - RecoTracker/MkFitCMS/src/runFunctions.cc | 2 - RecoTracker/MkFitCMS/standalone/Makefile | 6 +- .../MkFitCMS/standalone/MkStandaloneSeqs.cc | 18 +- RecoTracker/MkFitCMS/standalone/MkStandaloneSeqs.h | 3 + RecoTracker/MkFitCMS/standalone/Shell.cc | 129 ++- RecoTracker/MkFitCMS/standalone/Shell.h | 10 + RecoTracker/MkFitCMS/standalone/ShellDict.h | 4 + RecoTracker/MkFitCMS/standalone/ShellLinkDef.h | 26 +- RecoTracker/MkFitCMS/standalone/buildtestMPlex.cc | 6 +- RecoTracker/MkFitCMS/standalone/mkFit.cc | 43 +- RecoTracker/MkFitCore/interface/BeamSpot.h | 17 + RecoTracker/MkFitCore/interface/Config.h | 9 +- RecoTracker/MkFitCore/interface/DeadRegion.h | 14 + RecoTracker/MkFitCore/interface/Hit.h | 16 - RecoTracker/MkFitCore/interface/HitStructures.h | 2 + RecoTracker/MkFitCore/interface/TrackerInfo.h | 47 +- RecoTracker/MkFitCore/src/Config.cc | 4 + RecoTracker/MkFitCore/src/Debug.h | 45 + RecoTracker/MkFitCore/src/JacCCS2Loc.ah | 136 +++ RecoTracker/MkFitCore/src/JacErrPropCurv1.ah | 147 +++ RecoTracker/MkFitCore/src/JacErrPropCurv2.ah | 204 ++++ RecoTracker/MkFitCore/src/JacLoc2CCS.ah | 125 +++ RecoTracker/MkFitCore/src/KalmanUtilsMPlex.cc | 973 +++++++++++++++- RecoTracker/MkFitCore/src/KalmanUtilsMPlex.h | 21 + RecoTracker/MkFitCore/src/Matriplex/GenMPlexOps.pl | 252 ++++- RecoTracker/MkFitCore/src/Matriplex/Matriplex.h | 275 ++++- .../MkFitCore/src/Matriplex/MatriplexCommon.h | 12 + RecoTracker/MkFitCore/src/Matriplex/MatriplexSym.h | 17 +- RecoTracker/MkFitCore/src/Matrix.h | 9 + RecoTracker/MkFitCore/src/MiniPropagators.cc | 48 + RecoTracker/MkFitCore/src/MiniPropagators.h | 6 + RecoTracker/MkFitCore/src/MkBuilder.cc | 22 +- RecoTracker/MkFitCore/src/MkFinder.cc | 125 ++- RecoTracker/MkFitCore/src/MkFinder.h | 3 +- RecoTracker/MkFitCore/src/MultHelixPlaneProp.ah | 358 ++++++ .../MkFitCore/src/MultHelixPlanePropTransp.ah | 282 +++++ RecoTracker/MkFitCore/src/OutErrCCS.ah | 196 ++++ RecoTracker/MkFitCore/src/OutErrCCSTransp.ah | 160 +++ RecoTracker/MkFitCore/src/PropagationMPlex.cc | 1164 ++++++++------------ RecoTracker/MkFitCore/src/PropagationMPlex.h | 12 + RecoTracker/MkFitCore/src/PropagationMPlex.icc | 976 ---------------- .../MkFitCore/src/PropagationMPlexCommon.cc | 153 +++ .../MkFitCore/src/PropagationMPlexEndcap.cc | 518 +++++++++ RecoTracker/MkFitCore/src/PropagationMPlexPlane.cc | 706 ++++++++++++ RecoTracker/MkFitCore/src/PsErrLoc.ah | 248 +++++ RecoTracker/MkFitCore/src/PsErrLocTransp.ah | 171 +++ RecoTracker/MkFitCore/src/PsErrLocUpd.ah | 114 ++ RecoTracker/MkFitCore/src/TrackerInfo.cc | 77 +- .../MkFitCore/standalone/ConfigStandalone.cc | 8 + .../MkFitCore/standalone/ConfigStandalone.h | 5 + RecoTracker/MkFitCore/standalone/Event.cc | 4 - RecoTracker/MkFitCore/standalone/Event.h | 3 +- RecoTracker/MkFitCore/standalone/Makefile | 1 - RecoTracker/MkFitCore/standalone/Makefile.config | 47 +- .../MkFitCore/standalone/README_buildFromCMSSW.txt | 11 +- .../RntDumper/MkFinder_selectHitIndices.icc | 3 + .../MkFitCore/standalone/RntDumper/RntDumper.cc | 3 + .../MkFitCore/standalone/TTreeValidation.cc | 4 +- RecoTracker/MkFitCore/standalone/TTreeValidation.h | 2 +- RecoTracker/MkFitCore/standalone/Validation.cc | 2 +- .../MkFitCore/standalone/attic/fittestMPlex.cc | 2 +- .../standalone/code-mod-tools/inplace-ahs.pl | 25 + .../code-mod-tools/re-identifier-do-it.pl | 0 .../standalone/code-mod-tools/re-identifier.pl | 0 .../MkFitCore/standalone/xeon_scripts/init-env.sh | 23 +- .../python/OfflinePrimaryVertices_cfi.py | 7 +- 95 files changed, 6372 insertions(+), 2042 deletions(-) create mode 100644 Configuration/Eras/python/Era_Run2_2016_UPC_cff.py rename Configuration/Eras/python/{Modifier_highBetaStar_2018_cff.py => Modifier_highBetaStar_cff.py} (54%) create mode 100644 RecoTracker/MkFitCore/interface/BeamSpot.h create mode 100644 RecoTracker/MkFitCore/interface/DeadRegion.h create mode 100644 RecoTracker/MkFitCore/src/JacCCS2Loc.ah create mode 100644 RecoTracker/MkFitCore/src/JacErrPropCurv1.ah create mode 100644 RecoTracker/MkFitCore/src/JacErrPropCurv2.ah create mode 100644 RecoTracker/MkFitCore/src/JacLoc2CCS.ah create mode 100644 RecoTracker/MkFitCore/src/MultHelixPlaneProp.ah create mode 100644 RecoTracker/MkFitCore/src/MultHelixPlanePropTransp.ah create mode 100644 RecoTracker/MkFitCore/src/OutErrCCS.ah create mode 100644 RecoTracker/MkFitCore/src/OutErrCCSTransp.ah delete mode 100644 RecoTracker/MkFitCore/src/PropagationMPlex.icc create mode 100644 RecoTracker/MkFitCore/src/PropagationMPlexCommon.cc create mode 100644 RecoTracker/MkFitCore/src/PropagationMPlexEndcap.cc create mode 100644 RecoTracker/MkFitCore/src/PropagationMPlexPlane.cc create mode 100644 RecoTracker/MkFitCore/src/PsErrLoc.ah create mode 100644 RecoTracker/MkFitCore/src/PsErrLocTransp.ah create mode 100644 RecoTracker/MkFitCore/src/PsErrLocUpd.ah create mode 100755 RecoTracker/MkFitCore/standalone/code-mod-tools/inplace-ahs.pl mode change 100644 => 100755 RecoTracker/MkFitCore/standalone/code-mod-tools/re-identifier-do-it.pl mode change 100644 => 100755 RecoTracker/MkFitCore/standalone/code-mod-tools/re-identifier.pl Switched to branch 'from-CMSSW_14_2_X_2024-10-09-1100'