From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/48091/head -> cms-sw/refs/pull/48091/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 .../python/upgradeWorkflowComponents.py            |  58 ++++-
 .../hltPfDeepFlavourJetTagsModEta2p4_cfi.py        |   4 +-
 .../modules/hltPfDeepFlavourJetTags_cfi.py         |   4 +-
 .../python/HLT_75e33/paths/DST_PFScouting_cfi.py   |  10 +
 HLTrigger/NGTScouting/plugins/BuildFile.xml        |  14 ++
 .../plugins/HLTElectronTableProducer.cc            |  22 ++
 .../NGTScouting/plugins/HLTPhotonTableProducer.cc  |  22 ++
 .../NGTScouting/plugins/HLTVertexTableProducer.cc  | 194 ++++++++++++++++
 .../NGTScouting/python/HLTNanoProducer_cff.py      |  64 +++++
 .../NGTScouting/python/hltEGammaPacker_cfi.py      |  29 +++
 HLTrigger/NGTScouting/python/hltElectrons_cfi.py   |  32 +++
 HLTrigger/NGTScouting/python/hltJets_cfi.py        |  48 ++++
 HLTrigger/NGTScouting/python/hltMuons_cfi.py       |  32 +++
 HLTrigger/NGTScouting/python/hltPhotons_cfi.py     |  26 +++
 HLTrigger/NGTScouting/python/hltTracks_cfi.py      |  43 ++++
 .../python/hltTriggerAcceptFilter_cfi.py           |  20 ++
 HLTrigger/NGTScouting/python/hltVertices_cfi.py    |  13 ++
 ...I_L1TrackTrigger_L1_L1P2GT_DIGI2RAW_HLT_NANO.py | 257 +++++++++++++++++++++
 ...Trigger_L1_L1P2GT_DIGI2RAW_HLT_Scouting_NANO.py | 257 +++++++++++++++++++++
 .../plugins/SimpleFlatTableProducerPlugins.cc      |   8 +
 PhysicsTools/NanoAOD/python/autoNANO.py            |   7 +
 PhysicsTools/NanoAOD/scripts/inspectNanoFile.py    |  34 +--
 .../plugins/DeepFlavourONNXJetTagsProducer.cc      |  36 ++-
 23 files changed, 1213 insertions(+), 21 deletions(-)
 create mode 100644 HLTrigger/NGTScouting/plugins/BuildFile.xml
 create mode 100644 HLTrigger/NGTScouting/plugins/HLTElectronTableProducer.cc
 create mode 100644 HLTrigger/NGTScouting/plugins/HLTPhotonTableProducer.cc
 create mode 100644 HLTrigger/NGTScouting/plugins/HLTVertexTableProducer.cc
 create mode 100644 HLTrigger/NGTScouting/python/HLTNanoProducer_cff.py
 create mode 100644 HLTrigger/NGTScouting/python/hltEGammaPacker_cfi.py
 create mode 100644 HLTrigger/NGTScouting/python/hltElectrons_cfi.py
 create mode 100644 HLTrigger/NGTScouting/python/hltJets_cfi.py
 create mode 100644 HLTrigger/NGTScouting/python/hltMuons_cfi.py
 create mode 100644 HLTrigger/NGTScouting/python/hltPhotons_cfi.py
 create mode 100644 HLTrigger/NGTScouting/python/hltTracks_cfi.py
 create mode 100644 HLTrigger/NGTScouting/python/hltTriggerAcceptFilter_cfi.py
 create mode 100644 HLTrigger/NGTScouting/python/hltVertices_cfi.py
 create mode 100644 HLTrigger/NGTScouting/test/step2_DIGI_L1TrackTrigger_L1_L1P2GT_DIGI2RAW_HLT_NANO.py
 create mode 100644 HLTrigger/NGTScouting/test/step2_DIGI_L1TrackTrigger_L1_L1P2GT_DIGI2RAW_HLT_Scouting_NANO.py
Switched to branch 'from-CMSSW_15_1_X_2025-05-15-1100'