From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47391/head -> cms-sw/refs/pull/47391/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. .../writehelpers/createExtended2016Payloads.sh | 2 +- .../writehelpers/createExtended2017Payloads.sh | 2 +- .../createExtended2017Plan1Payloads.sh | 91 +++++----- .../writehelpers/createExtended2018Payloads.sh | 101 +++++------ .../writehelpers/geometryExtended2016_writer.py | 30 ++-- .../geometryExtended2017Plan1_writer.py | 80 +++++---- .../geometryExtended2017Plan1_xmlwriter.py | 18 +- .../writehelpers/geometryExtended2017_writer.py | 32 ++-- .../writehelpers/geometryExtended2018_writer.py | 81 +++++---- .../writehelpers/geometryExtended2018_xmlwriter.py | 18 +- Configuration/Applications/python/ConfigBuilder.py | 3 +- DataFormats/FWLite/test/chainevent_looping_cint.C | 146 ++++++++-------- DataFormats/FWLite/test/event_looping_cint.C | 103 ++++++----- .../FWLite/test/event_looping_consumes_cint.C | 4 +- DataFormats/FWLite/test/runlumi_looping_cint.C | 170 +++++++++---------- DataFormats/FWLite/test/triggernames_cint.C | 42 ++--- DataFormats/FWLite/test/triggernames_multi_cint.C | 42 ++--- .../HLT_75e33/modules/hltL1DoubleNNTau52_cfi.py | 15 -- .../modules/hltL1TkDoubleMuFiltered7_cfi.py | 15 -- .../modules/hltL1TkSingleMuFiltered15_cfi.py | 15 -- .../modules/hltL1TkSingleMuFiltered22_cfi.py | 15 -- .../modules/l1t1PFPuppiJet70offMaxEta2p4_cfi.py | 14 -- .../modules/l1t2PFPuppiJet55offMaxEta2p4_cfi.py | 14 -- .../modules/l1t4PFPuppiJet25OnlineMaxEta2p4_cfi.py | 9 - .../modules/l1t4PFPuppiJet40offMaxEta2p4_cfi.py | 14 -- .../l1tDoublePFPuppiJet112offMaxEta2p4_cfi.py | 15 -- .../l1tDoublePFPuppiJets112offMaxDeta1p6_cfi.py | 22 --- .../modules/l1tPFPuppiHT400offMaxEta2p4_cfi.py | 10 -- .../HLT_75e33/modules/l1tPFPuppiHT450off_cfi.py | 10 -- .../HLT_75e33/modules/l1tPFPuppiMET220off_cfi.py | 10 -- .../modules/l1tSinglePFPuppiJet230off_cfi.py | 14 -- .../HLT_75e33/paths/L1T_DoubleNNTau52_cfi.py | 6 - .../L1T_DoublePFPuppiJets112_2p4_DEta1p6_cfi.py | 8 - .../HLT_75e33/paths/L1T_DoubleTkMuon_15_7_cfi.py | 9 - ...HT400PT30_QuadPFPuppiJet_70_55_40_40_2p4_cfi.py | 11 -- .../HLT_75e33/paths/L1T_PFPuppiHT450off_cfi.py | 7 - .../HLT_75e33/paths/L1T_PFPuppiMET220off_cfi.py | 7 - .../HLT_75e33/paths/L1T_SingleNNTau150_cfi.py | 6 - .../paths/L1T_SinglePFPuppiJet230off_cfi.py | 7 - .../HLT_75e33/paths/L1T_SingleTkMuon_22_cfi.py | 7 - .../HLT_75e33/paths/L1T_TkEle25TkEle12_cfi.py | 7 - .../python/HLT_75e33/paths/L1T_TkEle36_cfi.py | 7 - .../python/HLT_75e33/paths/L1T_TkEm37TkEm24_cfi.py | 7 - .../python/HLT_75e33/paths/L1T_TkEm51_cfi.py | 7 - .../HLT_75e33/paths/L1T_TkIsoEle22TkEm12_cfi.py | 7 - .../python/HLT_75e33/paths/L1T_TkIsoEle28_cfi.py | 7 - .../HLT_75e33/paths/L1T_TkIsoEm22TkIsoEm12_cfi.py | 7 - .../python/HLT_75e33/paths/L1T_TkIsoEm36_cfi.py | 7 - .../HLT_75e33/paths/L1T_TripleTkMuon_5_3_3_cfi.py | 10 -- .../sequences/L1TTkEle25TkEle12Sequence_cfi.py | 7 - .../HLT_75e33/sequences/L1TTkEle36Sequence_cfi.py | 6 - .../sequences/L1TTkEm37TkEm24Sequence_cfi.py | 7 - .../HLT_75e33/sequences/L1TTkEm51Sequence_cfi.py | 6 - .../sequences/L1TTkIsoEle22TkEm12Sequence_cfi.py | 7 - .../sequences/L1TTkIsoEle28Sequence_cfi.py | 6 - .../sequences/L1TTkIsoEm22TkIsoEm12Sequence_cfi.py | 7 - .../sequences/L1TTkIsoEm36Sequence_cfi.py | 6 - HLTrigger/Configuration/python/HLT_75e33_cff.py | 45 ----- .../Configuration/python/HLT_75e33_timing_cff.py | 46 ----- JetMETCorrections/Modules/src/JetResolution.cc | 2 + .../Configuration/python/Phase2GTMenus/README.md | 25 +++ .../GlobalCaloTrigger/src/L1GlobalCaloTrigger.cc | 2 + L1Trigger/Phase2L1GT/README.md | 85 +++++++++- L1Trigger/Phase2L1GT/test/test_GT.py | 2 +- .../plugins/alpaka/clusterTracksDBSCAN.h | 6 +- .../plugins/alpaka/clusterTracksIterative.h | 6 +- Utilities/RelMon/python/directories2html.py | 16 +- .../RecoTrack/plugins/SimpleTrackValidation.cc | 188 +++++++++++++++++++++ 68 files changed, 814 insertions(+), 952 deletions(-) delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltL1DoubleNNTau52_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkDoubleMuFiltered7_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkSingleMuFiltered15_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltL1TkSingleMuFiltered22_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/l1t1PFPuppiJet70offMaxEta2p4_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/l1t2PFPuppiJet55offMaxEta2p4_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/l1t4PFPuppiJet25OnlineMaxEta2p4_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/l1t4PFPuppiJet40offMaxEta2p4_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/l1tDoublePFPuppiJet112offMaxEta2p4_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/l1tDoublePFPuppiJets112offMaxDeta1p6_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT400offMaxEta2p4_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiHT450off_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/l1tPFPuppiMET220off_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/l1tSinglePFPuppiJet230off_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_DoubleNNTau52_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_DoublePFPuppiJets112_2p4_DEta1p6_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_DoubleTkMuon_15_7_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_PFHT400PT30_QuadPFPuppiJet_70_55_40_40_2p4_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_PFPuppiHT450off_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_PFPuppiMET220off_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_SingleNNTau150_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_SinglePFPuppiJet230off_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_SingleTkMuon_22_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_TkEle25TkEle12_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_TkEle36_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_TkEm37TkEm24_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_TkEm51_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_TkIsoEle22TkEm12_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_TkIsoEle28_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_TkIsoEm22TkIsoEm12_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_TkIsoEm36_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/paths/L1T_TripleTkMuon_5_3_3_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEle25TkEle12Sequence_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEle36Sequence_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEm37TkEm24Sequence_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkEm51Sequence_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEle22TkEm12Sequence_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEle28Sequence_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEm22TkIsoEm12Sequence_cfi.py delete mode 100644 HLTrigger/Configuration/python/HLT_75e33/sequences/L1TTkIsoEm36Sequence_cfi.py create mode 100644 L1Trigger/Configuration/python/Phase2GTMenus/README.md create mode 100644 Validation/RecoTrack/plugins/SimpleTrackValidation.cc Switched to branch 'from-CMSSW_15_1_X_2025-02-18-1100'