Break L1TMuonPhase2/Constants.h header and move Phase2L1GMT private h…

…eader in to plugins
cms-sw · Sep 16, 2022 · d8e290d · d8e290d
1 parent a7b158c
commit d8e290d
Show file tree

Hide file tree

Showing 16 changed files with 1,246 additions and 1,235 deletions.
diff --git a/DataFormats/L1TMuonPhase2/interface/Constants.h b/DataFormats/L1TMuonPhase2/interface/Constants.h
diff --git a/DataFormats/L1TMuonPhase2/interface/SAMuon.h b/DataFormats/L1TMuonPhase2/interface/SAMuon.h
@@ -7,7 +7,6 @@
 #include "DataFormats/Common/interface/Ptr.h"
 #include "DataFormats/L1TMuon/interface/RegionalMuonCand.h"
 #include "DataFormats/L1TMuon/interface/RegionalMuonCandFwd.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/L1TMuonPhase2/interface/Constants.h"
 
 namespace l1t {

diff --git a/DataFormats/L1TMuonPhase2/src/SAMuon.cc b/DataFormats/L1TMuonPhase2/src/SAMuon.cc
@@ -1,4 +1,5 @@
 #include "DataFormats/L1TMuonPhase2/interface/SAMuon.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace l1t;
 

diff --git a/L1Trigger/Phase2L1GMT/plugins/BuildFile.xml b/L1Trigger/Phase2L1GMT/plugins/BuildFile.xml
@@ -6,5 +6,6 @@
   <use name="hepmc"/>
   <use name="hls"/>
   <use name="root"/>
-  <flags   EDM_PLUGIN="1"/>
+  <flags REM_CXXFLAGS="-fsanitize=undefined" FILE="Phase2L1TGMTProducer.cc"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/Phase2L1GMT/plugins/Constants.h b/L1Trigger/Phase2L1GMT/plugins/Constants.h
diff --git a/.../Phase2L1GMT/interface/ConvertedTTTrack.h → ...er/Phase2L1GMT/plugins/ConvertedTTTrack.h b/.../Phase2L1GMT/interface/ConvertedTTTrack.h → ...er/Phase2L1GMT/plugins/ConvertedTTTrack.h
@@ -1,7 +1,7 @@
 #ifndef PHASE2GMT_CONEVRTEDTTRACK
 #define PHASE2GMT_CONEVRTEDTTRACK
-#include "DataFormats/L1TMuonPhase2/interface/Constants.h"
 #include "DataFormats/L1TrackTrigger/interface/TTTypes.h"
+#include "DataFormats/L1TMuonPhase2/interface/Constants.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 namespace Phase2L1GMT {

diff --git a/L1Trigger/Phase2L1GMT/interface/Isolation.h → L1Trigger/Phase2L1GMT/plugins/Isolation.h b/L1Trigger/Phase2L1GMT/interface/Isolation.h → L1Trigger/Phase2L1GMT/plugins/Isolation.h
@@ -16,7 +16,7 @@
 #ifndef PHASE2GMT_ISOLATION
 #define PHASE2GMT_ISOLATION
 
-#include "L1Trigger/Phase2L1GMT/interface/TopologicalAlgorithm.h"
+#include "TopologicalAlgorithm.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

diff --git a/L1Trigger/Phase2L1GMT/interface/MuonROI.h → L1Trigger/Phase2L1GMT/plugins/MuonROI.h b/L1Trigger/Phase2L1GMT/interface/MuonROI.h → L1Trigger/Phase2L1GMT/plugins/MuonROI.h
diff --git a/L1Trigger/Phase2L1GMT/interface/Node.h → L1Trigger/Phase2L1GMT/plugins/Node.h b/L1Trigger/Phase2L1GMT/interface/Node.h → L1Trigger/Phase2L1GMT/plugins/Node.h
@@ -1,11 +1,11 @@
 #ifndef PHASE2GMT_NODE
 #define PHASE2GMT_NODE
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "L1Trigger/Phase2L1GMT/interface/TrackConverter.h"
-#include "L1Trigger/Phase2L1GMT/interface/ROITempAssociator.h"
-#include "L1Trigger/Phase2L1GMT/interface/TrackMuonMatchAlgorithm.h"
-#include "L1Trigger/Phase2L1GMT/interface/Isolation.h"
-#include "L1Trigger/Phase2L1GMT/interface/Tauto3Mu.h"
+#include "TrackConverter.h"
+#include "ROITempAssociator.h"
+#include "TrackMuonMatchAlgorithm.h"
+#include "Isolation.h"
+#include "Tauto3Mu.h"
 #include "DataFormats/L1TMuonPhase2/interface/TrackerMuon.h"
 
 namespace Phase2L1GMT {

diff --git a/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTProducer.cc b/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTProducer.cc
@@ -8,7 +8,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/StreamID.h"
 #include "DataFormats/L1TMuonPhase2/interface/TrackerMuon.h"
-#include "L1Trigger/Phase2L1GMT/interface/Node.h"
+#include "Node.h"
 
 //
 // class declaration

diff --git a/...ase2L1GMT/interface/PreTrackMatchedMuon.h → ...Phase2L1GMT/plugins/PreTrackMatchedMuon.h b/...ase2L1GMT/interface/PreTrackMatchedMuon.h → ...Phase2L1GMT/plugins/PreTrackMatchedMuon.h
diff --git a/...Phase2L1GMT/interface/ROITempAssociator.h → ...r/Phase2L1GMT/plugins/ROITempAssociator.h b/...Phase2L1GMT/interface/ROITempAssociator.h → ...r/Phase2L1GMT/plugins/ROITempAssociator.h
@@ -2,7 +2,7 @@
 #define PHASE2GMT_TEMPORARY_ASSOCIATOR
 
 #include "ap_int.h"
-#include "L1Trigger/Phase2L1GMT/interface/MuonROI.h"
+#include "MuonROI.h"
 #include "DataFormats/L1TMuonPhase2/interface/MuonStub.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 

diff --git a/L1Trigger/Phase2L1GMT/interface/Tauto3Mu.h → L1Trigger/Phase2L1GMT/plugins/Tauto3Mu.h b/L1Trigger/Phase2L1GMT/interface/Tauto3Mu.h → L1Trigger/Phase2L1GMT/plugins/Tauto3Mu.h
@@ -16,7 +16,7 @@
 #ifndef PHASE2GMT_TAUTO3MU
 #define PHASE2GMT_TAUTO3MU
 
-#include "L1Trigger/Phase2L1GMT/interface/TopologicalAlgorithm.h"
+#include "TopologicalAlgorithm.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 namespace Phase2L1GMT {

diff --git a/...se2L1GMT/interface/TopologicalAlgorithm.h → ...hase2L1GMT/plugins/TopologicalAlgorithm.h b/...se2L1GMT/interface/TopologicalAlgorithm.h → ...hase2L1GMT/plugins/TopologicalAlgorithm.h
@@ -17,7 +17,7 @@
 #define PHASE2GMT_TOPOLOGICALALGORITHM
 
 #include "DataFormats/L1TMuonPhase2/interface/TrackerMuon.h"
-#include "L1Trigger/Phase2L1GMT/interface/ConvertedTTTrack.h"
+#include "ConvertedTTTrack.h"
 #include "DataFormats/L1TMuonPhase2/interface/Constants.h"
 
 #include <fstream>

diff --git a/...er/Phase2L1GMT/interface/TrackConverter.h → ...gger/Phase2L1GMT/plugins/TrackConverter.h b/...er/Phase2L1GMT/interface/TrackConverter.h → ...gger/Phase2L1GMT/plugins/TrackConverter.h
@@ -1,7 +1,8 @@
 #ifndef PHASE2GMT_TRACKCONVERTER
 #define PHASE2GMT_TRACKCONVERTER
 
-#include "L1Trigger/Phase2L1GMT/interface/ConvertedTTTrack.h"
+#include "ConvertedTTTrack.h"
+#include "Constants.h"
 #include "DataFormats/L1TMuonPhase2/interface/TrackerMuon.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 

diff --git a/...L1GMT/interface/TrackMuonMatchAlgorithm.h → ...e2L1GMT/plugins/TrackMuonMatchAlgorithm.h b/...L1GMT/interface/TrackMuonMatchAlgorithm.h → ...e2L1GMT/plugins/TrackMuonMatchAlgorithm.h
@@ -9,12 +9,12 @@
 #include "DataFormats/L1TMuon/interface/RegionalMuonCand.h"
 #include "DataFormats/L1TMuon/interface/RegionalMuonCandFwd.h"
 #include "DataFormats/L1Trigger/interface/L1TObjComparison.h"
-#include "L1Trigger/Phase2L1GMT/interface/TrackConverter.h"
-#include "L1Trigger/Phase2L1GMT/interface/PreTrackMatchedMuon.h"
+#include "TrackConverter.h"
+#include "PreTrackMatchedMuon.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/L1TMuonPhase2/interface/Constants.h"
-#include "L1Trigger/Phase2L1GMT/interface/MuonROI.h"
-#include "L1Trigger/Phase2L1GMT/interface/ConvertedTTTrack.h"
+#include "MuonROI.h"
+#include "ConvertedTTTrack.h"
+#include "Constants.h"
 #include <fstream>
 
 namespace Phase2L1GMT {