Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[125X] Split L1TMuonPhase2/Constants.h header and move Phase2L1GMT private headers in to plugins #39410

Merged
merged 1 commit into from Sep 17, 2022
Merged

[125X] Split L1TMuonPhase2/Constants.h header and move Phase2L1GMT private headers in to plugins #39410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1,218 changes: 2 additions & 1,216 deletions DataFormats/L1TMuonPhase2/interface/Constants.h
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion DataFormats/L1TMuonPhase2/interface/SAMuon.h
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions DataFormats/L1TMuonPhase2/src/SAMuon.cc
View file
Open in desktop
@@ -1,4 +1,5 @@
#include "DataFormats/L1TMuonPhase2/interface/SAMuon.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

using namespace l1t;

Expand Down
3 changes: 2 additions & 1 deletion L1Trigger/Phase2L1GMT/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -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>
1,223 changes: 1,223 additions & 0 deletions L1Trigger/Phase2L1GMT/plugins/Constants.h
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .../Phase2L1GMT/interface/ConvertedTTTrack.h → ...er/Phase2L1GMT/plugins/ConvertedTTTrack.h
View file
Open in desktop
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/Phase2L1GMT/interface/Isolation.h → L1Trigger/Phase2L1GMT/plugins/Isolation.h
View file
Open in desktop
Expand Up @@ -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"

Expand Down
0 L1Trigger/Phase2L1GMT/interface/MuonROI.h → L1Trigger/Phase2L1GMT/plugins/MuonROI.h
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions L1Trigger/Phase2L1GMT/interface/Node.h → L1Trigger/Phase2L1GMT/plugins/Node.h
View file
Open in desktop
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTProducer.cc
View file
Open in desktop
Expand Up @@ -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
Expand Down
0 ...ase2L1GMT/interface/PreTrackMatchedMuon.h → ...Phase2L1GMT/plugins/PreTrackMatchedMuon.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...Phase2L1GMT/interface/ROITempAssociator.h → ...r/Phase2L1GMT/plugins/ROITempAssociator.h
View file
Open in desktop
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/Phase2L1GMT/interface/Tauto3Mu.h → L1Trigger/Phase2L1GMT/plugins/Tauto3Mu.h
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...se2L1GMT/interface/TopologicalAlgorithm.h → ...hase2L1GMT/plugins/TopologicalAlgorithm.h
View file
Open in desktop
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion ...er/Phase2L1GMT/interface/TrackConverter.h → ...gger/Phase2L1GMT/plugins/TrackConverter.h
View file
Open in desktop
@@ -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"

Expand Down
10 changes: 5 additions & 5 deletions ...L1GMT/interface/TrackMuonMatchAlgorithm.h → ...e2L1GMT/plugins/TrackMuonMatchAlgorithm.h
View file
Open in desktop
Expand Up @@ -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 {
Expand Down