From 2956ea65adc0c8556eaa695f6d69ae14af7660b6 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Fri, 16 Sep 2022 11:00:10 +0200 Subject: [PATCH 1/2] Move Phase2L1GMT private headers in to plugins dir --- DataFormats/L1TMuonPhase2/interface/SAMuon.h | 1 - DataFormats/L1TMuonPhase2/src/SAMuon.cc | 1 + .../Phase2L1GMT/{interface => plugins}/Constants.h | 0 .../{interface => plugins}/ConvertedTTTrack.h | 2 +- .../Phase2L1GMT/{interface => plugins}/Isolation.h | 2 +- L1Trigger/Phase2L1GMT/{interface => plugins}/MuonROI.h | 2 +- L1Trigger/Phase2L1GMT/{interface => plugins}/Node.h | 10 +++++----- L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTProducer.cc | 2 +- .../Phase2L1GMT/plugins/Phase2L1TGMTSAMuonProducer.cc | 2 +- .../{interface => plugins}/PreTrackMatchedMuon.h | 2 +- .../{interface => plugins}/ROITempAssociator.h | 2 +- .../Phase2L1GMT/{interface => plugins}/Tauto3Mu.h | 2 +- .../{interface => plugins}/TopologicalAlgorithm.h | 4 ++-- .../{interface => plugins}/TrackConverter.h | 3 ++- .../{interface => plugins}/TrackMuonMatchAlgorithm.h | 10 +++++----- 15 files changed, 23 insertions(+), 22 deletions(-) rename L1Trigger/Phase2L1GMT/{interface => plugins}/Constants.h (100%) rename L1Trigger/Phase2L1GMT/{interface => plugins}/ConvertedTTTrack.h (98%) rename L1Trigger/Phase2L1GMT/{interface => plugins}/Isolation.h (99%) rename L1Trigger/Phase2L1GMT/{interface => plugins}/MuonROI.h (98%) rename L1Trigger/Phase2L1GMT/{interface => plugins}/Node.h (97%) rename L1Trigger/Phase2L1GMT/{interface => plugins}/PreTrackMatchedMuon.h (99%) rename L1Trigger/Phase2L1GMT/{interface => plugins}/ROITempAssociator.h (98%) rename L1Trigger/Phase2L1GMT/{interface => plugins}/Tauto3Mu.h (98%) rename L1Trigger/Phase2L1GMT/{interface => plugins}/TopologicalAlgorithm.h (97%) rename L1Trigger/Phase2L1GMT/{interface => plugins}/TrackConverter.h (98%) rename L1Trigger/Phase2L1GMT/{interface => plugins}/TrackMuonMatchAlgorithm.h (98%) diff --git a/DataFormats/L1TMuonPhase2/interface/SAMuon.h b/DataFormats/L1TMuonPhase2/interface/SAMuon.h index b5158b8174fdc..f38278fa6e9a0 100644 --- 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" namespace l1t { diff --git a/DataFormats/L1TMuonPhase2/src/SAMuon.cc b/DataFormats/L1TMuonPhase2/src/SAMuon.cc index a6e19d5d7e991..b759b84ce1c45 100644 --- 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/interface/Constants.h b/L1Trigger/Phase2L1GMT/plugins/Constants.h similarity index 100% rename from L1Trigger/Phase2L1GMT/interface/Constants.h rename to L1Trigger/Phase2L1GMT/plugins/Constants.h diff --git a/L1Trigger/Phase2L1GMT/interface/ConvertedTTTrack.h b/L1Trigger/Phase2L1GMT/plugins/ConvertedTTTrack.h similarity index 98% rename from L1Trigger/Phase2L1GMT/interface/ConvertedTTTrack.h rename to L1Trigger/Phase2L1GMT/plugins/ConvertedTTTrack.h index b890d5571afa1..d6100669d49ca 100644 --- a/L1Trigger/Phase2L1GMT/interface/ConvertedTTTrack.h +++ b/L1Trigger/Phase2L1GMT/plugins/ConvertedTTTrack.h @@ -1,6 +1,6 @@ #ifndef PHASE2GMT_CONEVRTEDTTRACK #define PHASE2GMT_CONEVRTEDTTRACK -#include "L1Trigger/Phase2L1GMT/interface/Constants.h" +//#include "Constants.h" #include "DataFormats/L1TrackTrigger/interface/TTTypes.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/L1Trigger/Phase2L1GMT/interface/Isolation.h b/L1Trigger/Phase2L1GMT/plugins/Isolation.h similarity index 99% rename from L1Trigger/Phase2L1GMT/interface/Isolation.h rename to L1Trigger/Phase2L1GMT/plugins/Isolation.h index c04b806505898..d5aa0ee635d7f 100644 --- a/L1Trigger/Phase2L1GMT/interface/Isolation.h +++ b/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 b/L1Trigger/Phase2L1GMT/plugins/MuonROI.h similarity index 98% rename from L1Trigger/Phase2L1GMT/interface/MuonROI.h rename to L1Trigger/Phase2L1GMT/plugins/MuonROI.h index 54dabcd2fb4c7..faab532176e39 100644 --- a/L1Trigger/Phase2L1GMT/interface/MuonROI.h +++ b/L1Trigger/Phase2L1GMT/plugins/MuonROI.h @@ -1,7 +1,7 @@ #ifndef PHASE2GMT_MUONROI #define PHASE2GMT_MUONROI #include -#include "L1Trigger/Phase2L1GMT/interface/Constants.h" +#include "Constants.h" #include "DataFormats/L1TMuonPhase2/interface/MuonStub.h" #include "DataFormats/L1TMuon/interface/RegionalMuonCand.h" #include "DataFormats/L1TMuon/interface/RegionalMuonCandFwd.h" diff --git a/L1Trigger/Phase2L1GMT/interface/Node.h b/L1Trigger/Phase2L1GMT/plugins/Node.h similarity index 97% rename from L1Trigger/Phase2L1GMT/interface/Node.h rename to L1Trigger/Phase2L1GMT/plugins/Node.h index 418aff66d5c80..f28a287f54074 100644 --- a/L1Trigger/Phase2L1GMT/interface/Node.h +++ b/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 index dc8f78b14f18d..5595b20e9c0b1 100644 --- 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/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTSAMuonProducer.cc b/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTSAMuonProducer.cc index 2fa61753f381c..ef37209906c5e 100644 --- a/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTSAMuonProducer.cc +++ b/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTSAMuonProducer.cc @@ -37,7 +37,7 @@ #include "DataFormats/L1Trigger/interface/L1MuonParticleFwd.h" #include "DataFormats/L1Trigger/interface/L1MuonParticle.h" -#include "L1Trigger/Phase2L1GMT/interface/Constants.h" +#include "Constants.h" #include "DataFormats/L1TMuonPhase2/interface/SAMuon.h" // // class declaration diff --git a/L1Trigger/Phase2L1GMT/interface/PreTrackMatchedMuon.h b/L1Trigger/Phase2L1GMT/plugins/PreTrackMatchedMuon.h similarity index 99% rename from L1Trigger/Phase2L1GMT/interface/PreTrackMatchedMuon.h rename to L1Trigger/Phase2L1GMT/plugins/PreTrackMatchedMuon.h index 76faa13e7cd45..e763635333376 100644 --- a/L1Trigger/Phase2L1GMT/interface/PreTrackMatchedMuon.h +++ b/L1Trigger/Phase2L1GMT/plugins/PreTrackMatchedMuon.h @@ -2,7 +2,7 @@ #define PHASE2GMT_PRETRACKMATCHEDMUON #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "L1Trigger/Phase2L1GMT/interface/Constants.h" +#include "Constants.h" #include "DataFormats/L1TMuon/interface/RegionalMuonCandFwd.h" #include "DataFormats/L1TMuonPhase2/interface/MuonStub.h" #include "DataFormats/Common/interface/Ptr.h" diff --git a/L1Trigger/Phase2L1GMT/interface/ROITempAssociator.h b/L1Trigger/Phase2L1GMT/plugins/ROITempAssociator.h similarity index 98% rename from L1Trigger/Phase2L1GMT/interface/ROITempAssociator.h rename to L1Trigger/Phase2L1GMT/plugins/ROITempAssociator.h index 9cc9a08243bde..633064697db20 100644 --- a/L1Trigger/Phase2L1GMT/interface/ROITempAssociator.h +++ b/L1Trigger/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 b/L1Trigger/Phase2L1GMT/plugins/Tauto3Mu.h similarity index 98% rename from L1Trigger/Phase2L1GMT/interface/Tauto3Mu.h rename to L1Trigger/Phase2L1GMT/plugins/Tauto3Mu.h index d117a5971a8d9..775cf64c617aa 100644 --- a/L1Trigger/Phase2L1GMT/interface/Tauto3Mu.h +++ b/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/L1Trigger/Phase2L1GMT/interface/TopologicalAlgorithm.h b/L1Trigger/Phase2L1GMT/plugins/TopologicalAlgorithm.h similarity index 97% rename from L1Trigger/Phase2L1GMT/interface/TopologicalAlgorithm.h rename to L1Trigger/Phase2L1GMT/plugins/TopologicalAlgorithm.h index 8a17bb292dcb7..6db8dcfa82d4f 100644 --- a/L1Trigger/Phase2L1GMT/interface/TopologicalAlgorithm.h +++ b/L1Trigger/Phase2L1GMT/plugins/TopologicalAlgorithm.h @@ -17,8 +17,8 @@ #define PHASE2GMT_TOPOLOGICALALGORITHM #include "DataFormats/L1TMuonPhase2/interface/TrackerMuon.h" -#include "L1Trigger/Phase2L1GMT/interface/ConvertedTTTrack.h" -#include "L1Trigger/Phase2L1GMT/interface/Constants.h" +#include "ConvertedTTTrack.h" +//#include "Constants.h" #include diff --git a/L1Trigger/Phase2L1GMT/interface/TrackConverter.h b/L1Trigger/Phase2L1GMT/plugins/TrackConverter.h similarity index 98% rename from L1Trigger/Phase2L1GMT/interface/TrackConverter.h rename to L1Trigger/Phase2L1GMT/plugins/TrackConverter.h index e42fb43bd4a9e..d175f34da179c 100644 --- a/L1Trigger/Phase2L1GMT/interface/TrackConverter.h +++ b/L1Trigger/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/L1Trigger/Phase2L1GMT/interface/TrackMuonMatchAlgorithm.h b/L1Trigger/Phase2L1GMT/plugins/TrackMuonMatchAlgorithm.h similarity index 98% rename from L1Trigger/Phase2L1GMT/interface/TrackMuonMatchAlgorithm.h rename to L1Trigger/Phase2L1GMT/plugins/TrackMuonMatchAlgorithm.h index 387f723f859c3..2d108594d7529 100644 --- a/L1Trigger/Phase2L1GMT/interface/TrackMuonMatchAlgorithm.h +++ b/L1Trigger/Phase2L1GMT/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 "L1Trigger/Phase2L1GMT/interface/Constants.h" -#include "L1Trigger/Phase2L1GMT/interface/MuonROI.h" -#include "L1Trigger/Phase2L1GMT/interface/ConvertedTTTrack.h" +#include "Constants.h" +#include "MuonROI.h" +#include "ConvertedTTTrack.h" #include namespace Phase2L1GMT { From 74594bafd8baaba36b2a573b8029a97f734f9fc8 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Fri, 16 Sep 2022 11:05:13 +0200 Subject: [PATCH 2/2] cleanup includes --- L1Trigger/Phase2L1GMT/plugins/ConvertedTTTrack.h | 1 - L1Trigger/Phase2L1GMT/plugins/TopologicalAlgorithm.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/L1Trigger/Phase2L1GMT/plugins/ConvertedTTTrack.h b/L1Trigger/Phase2L1GMT/plugins/ConvertedTTTrack.h index d6100669d49ca..780b9eddcbda4 100644 --- a/L1Trigger/Phase2L1GMT/plugins/ConvertedTTTrack.h +++ b/L1Trigger/Phase2L1GMT/plugins/ConvertedTTTrack.h @@ -1,6 +1,5 @@ #ifndef PHASE2GMT_CONEVRTEDTTRACK #define PHASE2GMT_CONEVRTEDTTRACK -//#include "Constants.h" #include "DataFormats/L1TrackTrigger/interface/TTTypes.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/L1Trigger/Phase2L1GMT/plugins/TopologicalAlgorithm.h b/L1Trigger/Phase2L1GMT/plugins/TopologicalAlgorithm.h index 6db8dcfa82d4f..e31bc450f3a9b 100644 --- a/L1Trigger/Phase2L1GMT/plugins/TopologicalAlgorithm.h +++ b/L1Trigger/Phase2L1GMT/plugins/TopologicalAlgorithm.h @@ -18,7 +18,7 @@ #include "DataFormats/L1TMuonPhase2/interface/TrackerMuon.h" #include "ConvertedTTTrack.h" -//#include "Constants.h" +#include "Constants.h" #include