move OrbitFlatTable to DataFormats/NanoAOD, as suggested by Matti

Author: patinkaew

DataFormats/L1Scouting/BuildFile.xml

@@ -1,6 +1,5 @@
 <use name="FWCore/Utilities"/>
 <use name="DataFormats/Common"/>
-<use name="DataFormats/NanoAOD"/>
 <export>
   <lib name="1"/>
 </export>

DataFormats/L1Scouting/src/classes.h

@@ -5,4 +5,3 @@
 #include "DataFormats/L1Scouting/interface/L1ScoutingMuon.h"
 #include "DataFormats/L1Scouting/interface/L1ScoutingCalo.h"
 #include "DataFormats/L1Scouting/interface/L1ScoutingBMTFStub.h"
-#include "DataFormats/L1Scouting/interface/OrbitFlatTable.h"

DataFormats/L1Scouting/src/classes_def.xml

@@ -46,10 +46,5 @@
   <class name="edm::Wrapper<l1ScoutingRun3::JetOrbitCollection>"/>
   <class name="edm::Wrapper<l1ScoutingRun3::MuonOrbitCollection>"/>
   <class name="edm::Wrapper<l1ScoutingRun3::TauOrbitCollection>"/>
-
-  <class name="l1ScoutingRun3::OrbitFlatTable" ClassVersion="3">
-    <version ClassVersion="3" checksum="1910072015"/>
-  </class>
-  <class name="edm::Wrapper<l1ScoutingRun3::OrbitFlatTable>"/>
-  
+ 
 </lcgdict>

…ts/L1Scouting/interface/OrbitFlatTable.h …rmats/NanoAOD/interface/OrbitFlatTable.hDataFormats/L1Scouting/interface/OrbitFlatTable.h renamed to DataFormats/NanoAOD/interface/OrbitFlatTable.h DataFormats/L1Scouting/interface/OrbitFlatTable.h renamed to DataFormats/NanoAOD/interface/OrbitFlatTable.h

@@ -1,6 +1,7 @@
 #include "Rtypes.h"
 
 #include "DataFormats/NanoAOD/interface/FlatTable.h"
+#include "DataFormats/NanoAOD/interface/OrbitFlatTable.h"
 #include "DataFormats/NanoAOD/interface/MergeableCounterTable.h"
 #include "DataFormats/NanoAOD/interface/UniqueString.h"
 #include "DataFormats/Common/interface/Wrapper.h"

DataFormats/NanoAOD/src/classes.h

@@ -44,5 +44,10 @@
         <version ClassVersion="3" checksum="2793726511"/>
     </class>
     <class name="edm::Wrapper<nanoaod::UniqueString>" />
+
+    <class name="l1ScoutingRun3::OrbitFlatTable" ClassVersion="3">
+        <version ClassVersion="3" checksum="1910072015"/>
+    </class>
+    <class name="edm::Wrapper<l1ScoutingRun3::OrbitFlatTable>"/>
 </lcgdict>
 

DataFormats/NanoAOD/src/classes_def.xml

@@ -5,7 +5,7 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "DataFormats/L1Scouting/interface/OrbitCollection.h"
-#include "DataFormats/L1Scouting/interface/OrbitFlatTable.h"
+#include "DataFormats/NanoAOD/interface/OrbitFlatTable.h"
 #include "DataFormats/L1Scouting/interface/L1ScoutingCalo.h"
 #include "DataFormats/L1Trigger/interface/EtSum.h"
 #include "L1TriggerScouting/Utilities/interface/conversion.h"

L1TriggerScouting/Utilities/plugins/L1ScoutingEtSumOrbitFlatTableProducer.cc

@@ -5,7 +5,7 @@
 #include <vector>
 #include <TTree.h>
 #include "FWCore/Framework/interface/OccurrenceForOutput.h"
-#include "DataFormats/L1Scouting/interface/OrbitFlatTable.h"
+#include "DataFormats/NanoAOD/interface/OrbitFlatTable.h"
 #include "DataFormats/Provenance/interface/BranchDescription.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 

L1TriggerScouting/Utilities/plugins/OrbitTableOutputBranches.h

@@ -6,7 +6,7 @@
 #include <bitset>
 #include <TTree.h>
 #include "FWCore/Framework/interface/OccurrenceForOutput.h"
-#include "DataFormats/L1Scouting/interface/OrbitFlatTable.h"
+#include "DataFormats/NanoAOD/interface/OrbitFlatTable.h"
 #include "DataFormats/Provenance/interface/BranchDescription.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 

L1TriggerScouting/Utilities/plugins/SelectedBxTableOutputBranches.h

@@ -17,7 +17,7 @@
 #include "PhysicsTools/NanoAOD/interface/SimpleFlatTableProducer.h"
 
 #include "DataFormats/L1Scouting/interface/OrbitCollection.h"
-#include "DataFormats/L1Scouting/interface/OrbitFlatTable.h"
+#include "DataFormats/NanoAOD/interface/OrbitFlatTable.h"
 
 template <typename T>
 class SimpleOrbitFlatTableProducer : public edm::stream::EDProducer<> {