From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47434/head -> cms-sw/refs/pull/47434/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. CommonTools/RecoUtils/plugins/LeptonFSRProducer.cc | 23 +- .../interface/AssociationVectorSelector.h | 5 +- .../python/upgradeWorkflowComponents.py | 37 +++ DataFormats/Common/interface/Handle.h | 18 +- DataFormats/Common/interface/HandleBase.h | 42 +-- DataFormats/Common/interface/OrphanHandle.h | 17 +- DataFormats/Common/interface/OrphanHandleBase.h | 22 +- DataFormats/Common/src/OrphanHandleBase.cc | 7 - DataFormats/GEMDigi/interface/ME0Stub.h | 85 ++++++ DataFormats/GEMDigi/interface/ME0StubCollection.h | 23 ++ DataFormats/GEMDigi/src/classes.h | 3 + DataFormats/GEMDigi/src/classes_def.xml | 12 + .../GctRawToDigi/plugins/L1GctInternJetProducer.cc | 172 ++++++----- .../HLT_75e33/modules/hltL1GTAcceptFilter_cfi.py | 6 + .../python/HLT_75e33/paths/DST_PFScouting_cfi.py | 64 ++++ .../HLT_75e33/sequences/HLTTrackingSequence_cfi.py | 9 +- .../Configuration/python/HLT_NGTScouting_cff.py | 295 ++++++++++++++++++ .../scripts/hltPhase2UpgradeIntegrationTests | 2 +- .../L1ExtraFromDigis/src/L1ExtraParticlesProd.cc | 36 +-- L1Trigger/L1TGEM/interface/ME0StubAlgoChamber.h | 21 ++ L1Trigger/L1TGEM/interface/ME0StubAlgoMask.h | 328 +++++++++++++++++++++ L1Trigger/L1TGEM/interface/ME0StubAlgoPartition.h | 26 ++ L1Trigger/L1TGEM/interface/ME0StubAlgoPatUnit.h | 37 +++ L1Trigger/L1TGEM/interface/ME0StubAlgoPatUnitMux.h | 24 ++ .../L1TGEM/interface/ME0StubAlgoSubfunction.h | 78 +++++ L1Trigger/L1TGEM/interface/ME0StubPrimitive.h | 90 ++++++ L1Trigger/L1TGEM/plugins/ME0StubBuilder.cc | 144 +++++++++ L1Trigger/L1TGEM/plugins/ME0StubBuilder.h | 55 ++++ L1Trigger/L1TGEM/plugins/ME0StubProducer.cc | 70 +++++ L1Trigger/L1TGEM/python/me0Stubs_cfi.py | 24 ++ L1Trigger/L1TGEM/src/ME0StubAlgoChamber.cc | 142 +++++++++ L1Trigger/L1TGEM/src/ME0StubAlgoMask.cc | 58 ++++ L1Trigger/L1TGEM/src/ME0StubAlgoPartition.cc | 132 +++++++++ L1Trigger/L1TGEM/src/ME0StubAlgoPatUnit.cc | 202 +++++++++++++ L1Trigger/L1TGEM/src/ME0StubAlgoPatUnitMux.cc | 75 +++++ L1Trigger/L1TGEM/src/ME0StubAlgoSubfunction.cc | 142 +++++++++ L1Trigger/L1TGEM/src/ME0StubPrimitive.cc | 98 ++++++ L1Trigger/Phase2L1GT/README.md | 9 + L1Trigger/Phase2L1GT/plugins/L1GTAcceptFilter.cc | 70 +++++ .../Phase2L1GT/plugins/L1GTDoubleObjectCond.cc | 21 ++ .../Phase2L1GT/plugins/L1GTEvaluationInterface.h | 124 +------- L1Trigger/Phase2L1GT/plugins/L1GTQuadObjectCond.cc | 24 ++ .../Phase2L1GT/plugins/L1GTSingleCollectionCut.h | 3 + .../Phase2L1GT/plugins/L1GTTripleObjectCond.cc | 23 ++ .../Phase2L1GT/python/l1GTAcceptFilter_cff.py | 6 + .../Phase2L1GT/test/gt_firmware_evaluation.py | 4 +- L1Trigger/Phase2L1GT/test/test_GT.py | 25 +- .../VertexFinder/plugins/TPStubValueMapProducer.cc | 2 +- .../MuonAssociators/plugins/MuonFSRProducer.cc | 24 +- .../plugins/PATGenCandsFromSimTracksProducer.cc | 25 +- .../src/SCEnergyCorrectorDRNProducer.cc | 2 +- .../FTLRecProducers/plugins/MTDRecHitProducer.cc | 5 +- .../TrackExtender/plugins/TrackExtenderWithMTD.cc | 86 +++--- .../PFSimProducer/plugins/SimPFProducer.cc | 2 +- .../RecoTau/plugins/PFRecoTauTagInfoProducer.cc | 28 +- RecoTracker/LSTCore/src/alpaka/Hit.h | 6 +- RecoTracker/LSTCore/src/alpaka/LSTEvent.dev.cc | 9 +- .../LSTCore/standalone/code/core/lst_math.h | 2 +- .../LSTCore/standalone/code/core/trkCore.cc | 6 +- .../standalone/efficiency/src/performance.cc | 31 +- .../SingleTrackPattern/src/CosmicTrackFinder.cc | 26 +- 61 files changed, 2711 insertions(+), 476 deletions(-) delete mode 100644 DataFormats/Common/src/OrphanHandleBase.cc create mode 100644 DataFormats/GEMDigi/interface/ME0Stub.h create mode 100644 DataFormats/GEMDigi/interface/ME0StubCollection.h create mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltL1GTAcceptFilter_cfi.py create mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/DST_PFScouting_cfi.py create mode 100644 HLTrigger/Configuration/python/HLT_NGTScouting_cff.py create mode 100644 L1Trigger/L1TGEM/interface/ME0StubAlgoChamber.h create mode 100644 L1Trigger/L1TGEM/interface/ME0StubAlgoMask.h create mode 100644 L1Trigger/L1TGEM/interface/ME0StubAlgoPartition.h create mode 100644 L1Trigger/L1TGEM/interface/ME0StubAlgoPatUnit.h create mode 100644 L1Trigger/L1TGEM/interface/ME0StubAlgoPatUnitMux.h create mode 100644 L1Trigger/L1TGEM/interface/ME0StubAlgoSubfunction.h create mode 100644 L1Trigger/L1TGEM/interface/ME0StubPrimitive.h create mode 100644 L1Trigger/L1TGEM/plugins/ME0StubBuilder.cc create mode 100644 L1Trigger/L1TGEM/plugins/ME0StubBuilder.h create mode 100644 L1Trigger/L1TGEM/plugins/ME0StubProducer.cc create mode 100644 L1Trigger/L1TGEM/python/me0Stubs_cfi.py create mode 100644 L1Trigger/L1TGEM/src/ME0StubAlgoChamber.cc create mode 100644 L1Trigger/L1TGEM/src/ME0StubAlgoMask.cc create mode 100644 L1Trigger/L1TGEM/src/ME0StubAlgoPartition.cc create mode 100644 L1Trigger/L1TGEM/src/ME0StubAlgoPatUnit.cc create mode 100644 L1Trigger/L1TGEM/src/ME0StubAlgoPatUnitMux.cc create mode 100644 L1Trigger/L1TGEM/src/ME0StubAlgoSubfunction.cc create mode 100644 L1Trigger/L1TGEM/src/ME0StubPrimitive.cc create mode 100644 L1Trigger/Phase2L1GT/plugins/L1GTAcceptFilter.cc create mode 100644 L1Trigger/Phase2L1GT/python/l1GTAcceptFilter_cff.py Switched to branch 'from-CMSSW_15_1_X_2025-03-03-2300'