cms-sw · missirol · May 13, 2026
diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py
@@ -118,11 +118,16 @@
 from DQMOffline.Configuration.DQMOffline_EventContent_cff import *
 #
 #
-# NANOAOD (incl. the NANO(EDM)AOD event contents for Run-3 L1-Scouting data)
+# NANOAOD
 #
 #
 from PhysicsTools.NanoAOD.NanoAODEDMEventContent_cff import *
-from PhysicsTools.NanoAOD.L1SCOUTNanoAODEDMEventContent_cff import *
+#
+#
+# NANOAOD for Run-3 L1-Scouting data
+#
+#
+from L1TriggerScouting.NanoAOD.L1SCOUTNanoAODEDMEventContent_cff import *
 #
 #
 # FastSim

diff --git a/L1TriggerScouting/NanoAOD/plugins/BuildFile.xml b/L1TriggerScouting/NanoAOD/plugins/BuildFile.xml
@@ -0,0 +1,17 @@
+<use name="tbb"/>
+<use name="CommonTools/Utils"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/L1Scouting"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/NanoAOD"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="IOPool/Provenance"/>
+<use name="L1TriggerScouting/Utilities"/>
+<use name="PhysicsTools/NanoAOD"/>
+<use name="Utilities/General"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/...utingCaloTowerPhysicalValueMapProducer.cc → ...utingCaloTowerPhysicalValueMapProducer.cc b/...utingCaloTowerPhysicalValueMapProducer.cc → ...utingCaloTowerPhysicalValueMapProducer.cc
diff --git a/.../L1ScoutingEtSumOrbitFlatTableProducer.cc → .../L1ScoutingEtSumOrbitFlatTableProducer.cc b/.../L1ScoutingEtSumOrbitFlatTableProducer.cc → .../L1ScoutingEtSumOrbitFlatTableProducer.cc
@@ -1,13 +1,12 @@
 #include <memory>
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-
 #include "DataFormats/L1Scouting/interface/OrbitCollection.h"
 #include "DataFormats/NanoAOD/interface/OrbitFlatTable.h"
 #include "DataFormats/L1Scouting/interface/L1ScoutingCalo.h"
 #include "DataFormats/L1Trigger/interface/EtSum.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "L1TriggerScouting/Utilities/interface/conversion.h"
 
 class L1ScoutingEtSumOrbitFlatTableProducer : public edm::stream::EDProducer<> {
@@ -415,4 +414,5 @@ std::unique_ptr<l1ScoutingRun3::OrbitFlatTable> L1ScoutingEtSumOrbitFlatTablePro
   return out;
 }
 
+#include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(L1ScoutingEtSumOrbitFlatTableProducer);
diff --git a/...ins/L1ScoutingPhysicalValueMapProducer.cc → ...ins/L1ScoutingPhysicalValueMapProducer.cc b/...ins/L1ScoutingPhysicalValueMapProducer.cc → ...ins/L1ScoutingPhysicalValueMapProducer.cc
@@ -1,25 +1,17 @@
-// system include files
 #include <memory>
 #include <sstream>
 
-// user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "CommonTools/Utils/interface/TypedStringObjectMethodCaller.h"
+#include "DataFormats/Common/interface/ValueMap.h"
+#include "DataFormats/L1Scouting/interface/OrbitCollection.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/ParameterSet/interface/allowedValues.h"
-
-#include "DataFormats/Common/interface/ValueMap.h"
-#include "DataFormats/L1Scouting/interface/OrbitCollection.h"
 #include "L1TriggerScouting/Utilities/interface/conversion.h"
 
-#include "CommonTools/Utils/interface/TypedStringObjectMethodCaller.h"
-
-/*
- * Base class
- */
 template <typename T>
 class L1ScoutingPhysicalValueMapProducer : public edm::stream::EDProducer<> {
 public:
@@ -143,6 +135,7 @@ using L1ScoutingJetPhysicalValueMapProducer = L1ScoutingPhysicalValueMapProducer
 using L1ScoutingEGammaPhysicalValueMapProducer = L1ScoutingPhysicalValueMapProducer<l1ScoutingRun3::EGamma>;
 using L1ScoutingTauPhysicalValueMapProducer = L1ScoutingPhysicalValueMapProducer<l1ScoutingRun3::Tau>;
 
+#include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(L1ScoutingMuonPhysicalValueMapProducer);
 DEFINE_FWK_MODULE(L1ScoutingJetPhysicalValueMapProducer);
 DEFINE_FWK_MODULE(L1ScoutingEGammaPhysicalValueMapProducer);

diff --git a/...ities/plugins/OrbitNanoAODOutputModule.cc → ...noAOD/plugins/OrbitNanoAODOutputModule.cc b/...ities/plugins/OrbitNanoAODOutputModule.cc → ...noAOD/plugins/OrbitNanoAODOutputModule.cc
@@ -38,8 +38,9 @@
 #include "DataFormats/Provenance/interface/BranchDescription.h"
 #include "DataFormats/Provenance/interface/ProcessHistoryRegistry.h"
 #include "DataFormats/NanoAOD/interface/FlatTable.h"
-#include "L1TriggerScouting/Utilities/plugins/OrbitTableOutputBranches.h"
-#include "L1TriggerScouting/Utilities/plugins/SelectedBxTableOutputBranches.h"
+
+#include "OrbitTableOutputBranches.h"
+#include "SelectedBxTableOutputBranches.h"
 
 #include "oneapi/tbb/task_arena.h"
 

diff --git a/...ities/plugins/OrbitTableOutputBranches.cc → ...noAOD/plugins/OrbitTableOutputBranches.cc b/...ities/plugins/OrbitTableOutputBranches.cc → ...noAOD/plugins/OrbitTableOutputBranches.cc
@@ -1,4 +1,4 @@
-#include "L1TriggerScouting/Utilities/plugins/OrbitTableOutputBranches.h"
+#include "OrbitTableOutputBranches.h"
 
 #include <limits>
 

diff --git a/...lities/plugins/OrbitTableOutputBranches.h → ...anoAOD/plugins/OrbitTableOutputBranches.h b/...lities/plugins/OrbitTableOutputBranches.h → ...anoAOD/plugins/OrbitTableOutputBranches.h
@@ -1,17 +1,18 @@
-#ifndef L1TriggerScouting_Utilities_OrbitTableOutputBranches_h
-#define L1TriggerScouting_Utilities_OrbitTableOutputBranches_h
+#ifndef L1TriggerScouting_NanoAOD_OrbitTableOutputBranches_h
+#define L1TriggerScouting_NanoAOD_OrbitTableOutputBranches_h
 
 #include <string>
 #include <vector>
 #include <TTree.h>
-#include "FWCore/Framework/interface/OccurrenceForOutput.h"
+
 #include "DataFormats/NanoAOD/interface/OrbitFlatTable.h"
-#include "DataFormats/Provenance/interface/BranchDescription.h"
+#include "DataFormats/Provenance/interface/ProductDescription.h"
+#include "FWCore/Framework/interface/OccurrenceForOutput.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 
 class OrbitTableOutputBranches {
 public:
-  OrbitTableOutputBranches(const edm::BranchDescription *desc, const edm::EDGetToken &token)
+  OrbitTableOutputBranches(const edm::ProductDescription *desc, const edm::EDGetToken &token)
       : m_token(token), m_extension(DontKnowYetIfMainOrExtension), m_branchesBooked(false) {
     if (desc->className() != "l1ScoutingRun3::OrbitFlatTable")
       throw cms::Exception("Configuration",

diff --git a/.../plugins/SelectedBxTableOutputBranches.cc → .../plugins/SelectedBxTableOutputBranches.cc b/.../plugins/SelectedBxTableOutputBranches.cc → .../plugins/SelectedBxTableOutputBranches.cc
@@ -1,4 +1,4 @@
-#include "L1TriggerScouting/Utilities/plugins/SelectedBxTableOutputBranches.h"
+#include "SelectedBxTableOutputBranches.h"
 
 void SelectedBxTableOutputBranches::beginFill(const edm::OccurrenceForOutput &iWhatever, TTree &tree) {
   if (m_branch == nullptr) {

diff --git a/...s/plugins/SelectedBxTableOutputBranches.h → ...D/plugins/SelectedBxTableOutputBranches.h b/...s/plugins/SelectedBxTableOutputBranches.h → ...D/plugins/SelectedBxTableOutputBranches.h
@@ -1,18 +1,19 @@
-#ifndef L1TriggerScouting_Utilities_SelectedBxTableOutputBranches_h
-#define L1TriggerScouting_Utilities_SelectedBxTableOutputBranches_h
+#ifndef L1TriggerScouting_NanoAOD_SelectedBxTableOutputBranches_h
+#define L1TriggerScouting_NanoAOD_SelectedBxTableOutputBranches_h
 
 #include <string>
 #include <vector>
 #include <bitset>
 #include <TTree.h>
-#include "FWCore/Framework/interface/OccurrenceForOutput.h"
+
 #include "DataFormats/NanoAOD/interface/OrbitFlatTable.h"
-#include "DataFormats/Provenance/interface/BranchDescription.h"
+#include "DataFormats/Provenance/interface/ProductDescription.h"
+#include "FWCore/Framework/interface/OccurrenceForOutput.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 
 class SelectedBxTableOutputBranches {
 public:
-  SelectedBxTableOutputBranches(const edm::BranchDescription *desc, const edm::EDGetToken &token)
+  SelectedBxTableOutputBranches(const edm::ProductDescription *desc, const edm::EDGetToken &token)
       : m_token(token), m_name("SelBx_" + desc->moduleLabel()), m_value(false), m_branch(nullptr) {
     if (desc->className() != "std::vector<unsigned int>")
       throw cms::Exception("Configuration", "SelectedBxTableOutputBranches can only write out vector<unsigned int>");

diff --git a/...s/plugins/SimpleOrbitFlatTableProducer.cc → ...D/plugins/SimpleOrbitFlatTableProducer.cc b/...s/plugins/SimpleOrbitFlatTableProducer.cc → ...D/plugins/SimpleOrbitFlatTableProducer.cc
@@ -1,23 +1,19 @@
 #include <memory>
-
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-#include "FWCore/ParameterSet/interface/EmptyGroupDescription.h"
-#include "FWCore/ParameterSet/interface/allowedValues.h"
-#include "Utilities/General/interface/ClassName.h"
+#include <vector>
 
 #include "CommonTools/Utils/interface/StringCutObjectSelector.h"
 #include "CommonTools/Utils/interface/StringObjectFunction.h"
-
 #include "DataFormats/Common/interface/ValueMap.h"
-#include "DataFormats/NanoAOD/interface/FlatTable.h"
-#include "PhysicsTools/NanoAOD/interface/SimpleFlatTableProducer.h"
-
-#include "DataFormats/L1Scouting/interface/OrbitCollection.h"
 #include "DataFormats/NanoAOD/interface/OrbitFlatTable.h"
+#include "DataFormats/L1Scouting/interface/OrbitCollection.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/ParameterSet/interface/allowedValues.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/EmptyGroupDescription.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "PhysicsTools/NanoAOD/interface/SimpleFlatTableProducer.h"
+#include "Utilities/General/interface/ClassName.h"
 
 template <typename T>
 class SimpleOrbitFlatTableProducer : public edm::stream::EDProducer<> {

diff --git a/...thon/L1SCOUTNanoAODEDMEventContent_cff.py → ...thon/L1SCOUTNanoAODEDMEventContent_cff.py b/...thon/L1SCOUTNanoAODEDMEventContent_cff.py → ...thon/L1SCOUTNanoAODEDMEventContent_cff.py
diff --git a/...noAOD/python/custom_l1scoutingrun3_cff.py → ...noAOD/python/custom_l1scoutingrun3_cff.py b/...noAOD/python/custom_l1scoutingrun3_cff.py → ...noAOD/python/custom_l1scoutingrun3_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from PhysicsTools.NanoAOD.l1scoutingrun3_cff import *
-from PhysicsTools.NanoAOD.L1SCOUTNanoAODEDMEventContent_cff import L1SCOUTNanoAODEDMEventContent, L1SCOUTNANOAODEventContent
+from L1TriggerScouting.NanoAOD.l1scoutingrun3_cff import *
+from L1TriggerScouting.NanoAOD.L1SCOUTNanoAODEDMEventContent_cff import L1SCOUTNanoAODEDMEventContent, L1SCOUTNANOAODEventContent
 
 from Configuration.Eras.Modifier_run3_l1scouting_2026_cff import run3_l1scouting_2026
 

diff --git a/...ools/NanoAOD/python/l1scoutingrun3_cff.py → ...ting/NanoAOD/python/l1scoutingrun3_cff.py b/...ools/NanoAOD/python/l1scoutingrun3_cff.py → ...ting/NanoAOD/python/l1scoutingrun3_cff.py
diff --git a/L1TriggerScouting/Utilities/plugins/BuildFile.xml b/L1TriggerScouting/Utilities/plugins/BuildFile.xml
@@ -1,17 +1,7 @@
-<use name="tbb"/>
-<use name="CommonTools/Utils"/>
-<use name="DataFormats/Common"/>
 <use name="DataFormats/L1Scouting"/>
-<use name="DataFormats/L1Trigger"/>
-<use name="DataFormats/NanoAOD"/>
-<use name="DataFormats/Provenance"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
-<use name="IOPool/Provenance"/>
 <use name="L1TriggerScouting/Utilities"/>
-<use name="PhysicsTools/NanoAOD"/>
-<use name="Utilities/General"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/PhysicsTools/NanoAOD/python/autoNANO.py b/PhysicsTools/NanoAOD/python/autoNANO.py
@@ -39,10 +39,10 @@ def expandNanoMapping(seqList, mapping, key):
     'ScoutFromMini' : {'sequence': '@Scout',
                        'customize': '@Scout+PhysicsTools/NanoAOD/custom_run3scouting_cff.customiseScoutingNanoFromMini'},
     # L1Scouting nano
-    'L1Scout': {'sequence': 'PhysicsTools/NanoAOD/custom_l1scoutingrun3_cff.l1scoutingNanoSequence',
-                'customize': 'PhysicsTools/NanoAOD/custom_l1scoutingrun3_cff.customiseL1ScoutingNanoAOD'},
-    'L1ScoutSelect': {'sequence': 'PhysicsTools/NanoAOD/custom_l1scoutingrun3_cff.l1scoutingNanoSequence',
-                      'customize': 'PhysicsTools/NanoAOD/custom_l1scoutingrun3_cff.customiseL1ScoutingNanoAODSelection'},
+    'L1Scout': {'sequence': 'L1TriggerScouting/NanoAOD/custom_l1scoutingrun3_cff.l1scoutingNanoSequence',
+                'customize': 'L1TriggerScouting/NanoAOD/custom_l1scoutingrun3_cff.customiseL1ScoutingNanoAOD'},
+    'L1ScoutSelect': {'sequence': 'L1TriggerScouting/NanoAOD/custom_l1scoutingrun3_cff.l1scoutingNanoSequence',
+                      'customize': 'L1TriggerScouting/NanoAOD/custom_l1scoutingrun3_cff.customiseL1ScoutingNanoAODSelection'},
     # BPH nano
     'BPH' : {'sequence': '@PHYS',
              'customize': '@PHYS+PhysicsTools/NanoAOD/custom_bph_cff.nanoAOD_customizeBPH'},