Merge pull request cms-sw#1003 from cecilecaillol/l1t-phase2-orpcomments

Comments received in master when porting phase-2 branch

DataFormats/L1TParticleFlow/interface/HPSPFTau.h

@@ -67,7 +67,7 @@ namespace l1t {
     float sumNeutralIso() const { return sumNeutralIso_; }
     float sumCombinedIso() const { return sumCombinedIso_; }
     float sumChargedIsoPileup() const { return sumChargedIsoPileup_; }
-    float Z() const { return Z_; }
+    float z() const { return z_; }
 
     bool passTightIso() const { return passTightIso_; }
     bool passMediumIso() const { return passMediumIso_; }
@@ -134,7 +134,7 @@ namespace l1t {
     void setSumNeutralIso(float sumNeutralIso) { sumNeutralIso_ = sumNeutralIso; }
     void setSumCombinedIso(float sumCombinedIso) { sumCombinedIso_ = sumCombinedIso; }
     void setSumChargedIsoPileup(float sumChargedIsoPileup) { sumChargedIsoPileup_ = sumChargedIsoPileup; }
-    void setZ(float Z) { Z_ = Z; }
+    void setZ(float Z) { z_ = Z; }
 
     void setPassTightIso(bool passTightIso) { passTightIso_ = passTightIso; }
     void setPassMediumIso(bool passMediumIso) { passMediumIso_ = passMediumIso; }
@@ -200,7 +200,7 @@ namespace l1t {
     bool passLooseRelIso_;
     bool passVLooseRelIso_;
 
-    float Z_;
+    float z_;
   };
 
 }  // namespace l1t

DataFormats/L1TParticleFlow/src/classes_def.xml

@@ -54,9 +54,9 @@
   <class name="std::vector<edm::Ref<l1t::PFTauCollection> >" /> 
 
   <class name="l1t::HPSPFTau" ClassVersion="13">
-    <version ClassVersion="11" checksum="98678086"/>
+    <version ClassVersion="13" checksum="588131857"/>
     <version ClassVersion="12" checksum="1127525942"/>
-    <version ClassVersion="13" checksum="588108529"/>
+    <version ClassVersion="11" checksum="98678086"/>
   </class>
   <class name="l1t::HPSPFTauCollection"/>
   <class name="edm::Wrapper<l1t::HPSPFTauCollection>"/>

L1Trigger/DemonstratorTools/plugins/GTTFileReader.cc

@@ -27,7 +27,7 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/StreamID.h"
 
@@ -89,18 +89,21 @@ void GTTFileReader::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
 
   l1t::VertexWordCollection vertices(decodeVertices(eventData.at({"vertices", 0})));
 
-  std::cout << vertices.size() << " vertices found" << std::endl;
+  edm::LogInfo("GTTFileReader") << vertices.size() << " vertices found";
 
   iEvent.put(std::make_unique<l1t::VertexWordCollection>(vertices));
 }
 
 // ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
 void GTTFileReader::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  //The following says we do not know what parameters are allowed so do no validation
-  // Please change this to state exactly what you do use, even if it is no parameters
+  // GTTFileReader
   edm::ParameterSetDescription desc;
-  desc.setUnknown();
-  descriptions.addDefault(desc);
+  desc.add<std::vector<std::string>>("files",
+                                     {
+                                         "gttOutput_0.txt",
+                                     });
+  desc.addUntracked<std::string>("format", "APx");
+  descriptions.add("GTTFileReader", desc);
 }
 
 //define this as a plug-in

L1Trigger/DemonstratorTools/plugins/GTTFileWriter.cc

@@ -174,17 +174,16 @@ void GTTFileWriter::endJob() {
 
 // ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
 void GTTFileWriter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  //The following says we do not know what parameters are allowed so do no validation
-  // Please change this to state exactly what you do use, even if it is no parameters
+  // GTTFileWriter
   edm::ParameterSetDescription desc;
-  desc.setUnknown();
-  descriptions.addDefault(desc);
-
-  //Specify that only 'tracks' is allowed
-  //To use, remove the default given above and uncomment below
-  //ParameterSetDescription desc;
-  //desc.addUntracked<edm::InputTag>("tracks","ctfWithMaterialTracks");
-  //descriptions.addDefault(desc);
+  desc.addUntracked<edm::InputTag>("tracks", edm::InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks"));
+  desc.addUntracked<edm::InputTag>("convertedTracks", edm::InputTag("L1GTTInputProducer", "Level1TTTracksConverted"));
+  desc.addUntracked<edm::InputTag>("vertices", edm::InputTag("VertexProducer", "l1verticesEmulation"));
+  desc.addUntracked<std::string>("inputFilename", "L1GTTInputFile");
+  desc.addUntracked<std::string>("inputConvertedFilename", "L1GTTInputConvertedFile");
+  desc.addUntracked<std::string>("outputFilename", "L1GTTOutputToCorrelatorFile");
+  desc.addUntracked<std::string>("format", "APx");
+  descriptions.add("GTTFileWriter", desc);
 }
 
 //define this as a plug-in

L1Trigger/L1CaloTrigger/plugins/L1TowerCalibrator.cc

@@ -38,7 +38,8 @@ This is all ECAL / HCAL specific or EM vs. Hadronic for HGCal.
 //
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/Framework/interface/one/EDProducer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -59,7 +60,7 @@ This is all ECAL / HCAL specific or EM vs. Hadronic for HGCal.
 #include "TFile.h"
 #include "TF1.h"
 
-class L1TowerCalibrator : public edm::stream::EDProducer<> {
+class L1TowerCalibrator : public edm::one::EDProducer<> {
 public:
   explicit L1TowerCalibrator(const edm::ParameterSet&);
 

L1Trigger/L1CaloTrigger/python/L1TowerCalibrationProducer_cfi.py

@@ -28,8 +28,6 @@
     hfSF = cms.double(1.0),
     debug = cms.bool(False),
     skipCalibrations = cms.bool(False),
-    #l1CaloTowers = cms.InputTag("L1EGammaClusterEmuProducer",),
-    #l1CaloTowers = cms.VInputTag(cms.InputTag("L1EGammaClusterEmuProducer","L1CaloTowerCollection","")),
     l1CaloTowers = cms.InputTag("L1EGammaClusterEmuProducer","L1CaloTowerCollection",""),
     L1HgcalTowersInputTag = cms.InputTag("hgcalTowerProducer:HGCalTowerProcessor"),
     hcalDigis = cms.InputTag("simHcalTriggerPrimitiveDigis"),

L1Trigger/L1CaloTrigger/test/ntuples/L1TriggerNtupleTrackTrigger.cc

@@ -34,7 +34,9 @@ class L1TriggerNtupleTrackTrigger : public L1TCaloTriggerNtupleBase {
                                           double iCharge,
                                           double iBField);
 
-  edm::EDGetToken track_token_;
+  edm::EDGetTokenT<std::vector<TTTrack<Ref_Phase2TrackerDigi_>>> track_token_;
+  edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> magf_token;
+  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geom_token;
 
   int l1track_n_;
   std::vector<float> l1track_pt_;
@@ -64,6 +66,8 @@ void L1TriggerNtupleTrackTrigger::initialize(TTree& tree,
                                              edm::ConsumesCollector&& collector) {
   track_token_ =
       collector.consumes<std::vector<TTTrack<Ref_Phase2TrackerDigi_>>>(conf.getParameter<edm::InputTag>("TTTracks"));
+  magf_token = collector.esConsumes();
+  geom_token = collector.esConsumes();
 
   tree.Branch(branch_name_w_prefix("n").c_str(), &l1track_n_, branch_name_w_prefix("n/I").c_str());
   tree.Branch(branch_name_w_prefix("pt").c_str(), &l1track_pt_);
@@ -87,14 +91,12 @@ void L1TriggerNtupleTrackTrigger::fill(const edm::Event& ev, const edm::EventSet
 
   float fBz = 0;
   if (magfield_watcher_.check(es)) {
-    edm::ESHandle<MagneticField> magfield;
-    es.get<IdealMagneticFieldRecord>().get(magfield);
+    const edm::ESHandle<MagneticField>& magfield = es.getHandle(magf_token);
     fBz = magfield->inTesla(GlobalPoint(0, 0, 0)).z();
   }
 
   // geometry needed to call pTFrom2Stubs
-  edm::ESHandle<TrackerGeometry> geomHandle;
-  es.get<TrackerDigiGeometryRecord>().get("idealForDigi", geomHandle);
+  const edm::ESHandle<TrackerGeometry>& geomHandle = es.getHandle(geom_token);
   const TrackerGeometry* tGeom = geomHandle.product();
 
   triggerTools_.eventSetup(es);

L1Trigger/L1TNtuples/src/L1AnalysisPhaseIIStep1.cc

@@ -63,7 +63,7 @@ void L1Analysis::L1AnalysisPhaseIIStep1::SetHPSPFTaus(const edm::Handle<l1t::HPS
     l1extra_.hpsTauPassTightRelIso.push_back(l1HPSPFTaus->at(i).passTightRelIso());
     bool hpsTauPassTightRelIsoMenuVar = (l1HPSPFTaus->at(i).sumChargedIso() / l1HPSPFTaus->at(i).pt()) < 0.05;
     l1extra_.hpsTauPassTightRelIsoMenu.push_back(hpsTauPassTightRelIsoMenuVar);
-    l1extra_.hpsTauZ0.push_back(l1HPSPFTaus->at(i).Z());
+    l1extra_.hpsTauZ0.push_back(l1HPSPFTaus->at(i).z());
     //if (!l1HPSPFTaus->at(i).leadChargedPFCand().isNull()){
     //    l1extra_.hpsTauZ0.push_back(l1HPSPFTaus->at(i).leadChargedPFCand()->pfTrack()->vertex().z());
     //}else{

L1Trigger/Phase2L1GMT/BuildFile.xml

@@ -2,6 +2,8 @@
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
 <use name="DataFormats/L1TMuonPhase2"/>
+<use name="DataFormats/L1TMuon"/>
+<use name="DataFormats/L1Trigger"/>
 <use name="L1Trigger/L1TMuon"/>
 <use name="L1Trigger/L1TTwinMux"/>
 <use name="hls"/>

L1Trigger/Phase2L1GMT/interface/Isolation.h

@@ -17,6 +17,8 @@
 #define PHASE2GMT_ISOLATION
 
 #include "L1Trigger/Phase2L1GMT/interface/TopologicalAlgorithm.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 namespace Phase2L1GMT {
   class Isolation : public TopoAlgo {
@@ -99,13 +101,13 @@ namespace Phase2L1GMT {
     int iso = (accum <= absiso_thrT ? 3 : accum <= absiso_thrM ? 2 : accum <= absiso_thrL ? 1 : 0);
 
     if (verbose_) {
-      cout << " [DEBUG Isolation] : absiso_threshold L : " << absiso_thrL << " accum " << accum
-           << " bit set : " << (accum < absiso_thrL) << endl;
-      cout << " [DEBUG Isolation] : absiso_threshold M : " << absiso_thrM << " accum " << accum
-           << " bit set : " << (accum < absiso_thrM) << endl;
-      cout << " [DEBUG Isolation] : absiso_threshold T : " << absiso_thrT << " accum " << accum
-           << " bit set : " << (accum < absiso_thrT) << endl;
-      cout << " [DEBUG Isolation] : absiso : " << (iso) << endl;
+      edm::LogInfo("Isolation") << " [DEBUG Isolation] : absiso_threshold L : " << absiso_thrL << " accum " << accum
+                                << " bit set : " << (accum < absiso_thrL);
+      edm::LogInfo("Isolation") << " [DEBUG Isolation] : absiso_threshold M : " << absiso_thrM << " accum " << accum
+                                << " bit set : " << (accum < absiso_thrM);
+      edm::LogInfo("Isolation") << " [DEBUG Isolation] : absiso_threshold T : " << absiso_thrT << " accum " << accum
+                                << " bit set : " << (accum < absiso_thrT);
+      edm::LogInfo("Isolation") << " [DEBUG Isolation] : absiso : " << (iso);
     }
     return iso;
   }
@@ -122,13 +124,13 @@ namespace Phase2L1GMT {
     int iso = (accum <= thrT.to_int() ? 3 : accum <= thrM.to_int() ? 2 : accum <= thrL.to_int() ? 1 : 0);
 
     if (verbose_) {
-      cout << " [DEBUG Isolation] : reliso_threshold L : " << thrL << " accum " << accum
-           << " bit set : " << (accum < thrL.to_int()) << endl;
-      cout << " [DEBUG Isolation] : reliso_threshold M : " << thrM << " accum " << accum
-           << " bit set : " << (accum < thrM.to_int()) << endl;
-      cout << " [DEBUG Isolation] : reliso_threshold T : " << thrT << " accum " << accum
-           << " bit set : " << (accum < thrT.to_int()) << endl;
-      cout << " [DEBUG Isolation] : reliso : " << (iso << 2) << " org " << iso << endl;
+      edm::LogInfo("Isolation") << " [DEBUG Isolation] : reliso_threshold L : " << thrL << " accum " << accum
+                                << " bit set : " << (accum < thrL.to_int());
+      edm::LogInfo("Isolation") << " [DEBUG Isolation] : reliso_threshold M : " << thrM << " accum " << accum
+                                << " bit set : " << (accum < thrM.to_int());
+      edm::LogInfo("Isolation") << " [DEBUG Isolation] : reliso_threshold T : " << thrT << " accum " << accum
+                                << " bit set : " << (accum < thrT.to_int());
+      edm::LogInfo("Isolation") << " [DEBUG Isolation] : reliso : " << (iso << 2) << " org " << iso;
     }
 
     return iso << 2;
@@ -143,7 +145,7 @@ namespace Phase2L1GMT {
 
     static int itest = 0;
     if (verbose_) {
-      std::cout << "........ RUNNING TEST NUMBER .......... " << itest++ << std::endl;
+      edm::LogInfo("Isolation") << "........ RUNNING TEST NUMBER .......... " << itest++;
     }
 
     for (auto &mu : trkMus) {
@@ -205,27 +207,27 @@ namespace Phase2L1GMT {
     bool pass_ovrl = (deta > 0 || dphi > 0 ? true : false);
 
     if (verbose_) {
-      cout << " [DEBUG compute_trk_iso] : Start of debug msg for compute_trk_iso" << endl;
-      cout << " [DEBUG compute_trk_iso] : incoming muon (pt / eta / phi / z0 / isvalid)" << endl;
-      cout << " [DEBUG compute_trk_iso] : MU  =  " << in_mu.hwPt() << " / " << in_mu.hwEta() << " / " << in_mu.hwPhi()
-           << " / " << in_mu.hwZ0() << " / " << 1 << endl;
-      cout << " [DEBUG compute_trk_iso] : incoming track (pt / eta / phi / z0 / isvalid)" << endl;
-      cout << " [DEBUG compute_trk_iso] : TRK =  " << in_trk.pt() << " / " << in_trk.eta() << " / " << in_trk.phi()
-           << " / " << in_trk.z0() << " / " << 1 << endl;
-      cout << " [DEBUG compute_trk_iso] : Delta phi : " << dphi << endl;
-      cout << " [DEBUG compute_trk_iso] : Delta eta : " << deta << endl;
-      cout << " [DEBUG compute_trk_iso] : Delta z0  : " << dz0 << endl;
-      cout << " [DEBUG compute_trk_iso] : pass_deta      : " << pass_deta << endl;
-      cout << " [DEBUG compute_trk_iso] : pass_dphi      : " << pass_dphi << endl;
-      cout << " [DEBUG compute_trk_iso] : pass_dz0       : " << pass_dz0 << endl;
-      cout << " [DEBUG compute_trk_iso] : pass_trkpt     : " << pass_trkpt << endl;
-      cout << " [DEBUG compute_trk_iso] : pass_ovrl      : " << pass_ovrl << endl;
+      edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : Start of debug msg for compute_trk_iso";
+      edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : incoming muon (pt / eta / phi / z0 / isvalid)";
+      edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : MU  =  " << in_mu.hwPt() << " / " << in_mu.hwEta()
+                                << " / " << in_mu.hwPhi() << " / " << in_mu.hwZ0() << " / " << 1;
+      edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : incoming track (pt / eta / phi / z0 / isvalid)";
+      edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : TRK =  " << in_trk.pt() << " / " << in_trk.eta() << " / "
+                                << in_trk.phi() << " / " << in_trk.z0() << " / " << 1;
+      edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : Delta phi : " << dphi;
+      edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : Delta eta : " << deta;
+      edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : Delta z0  : " << dz0;
+      edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : pass_deta      : " << pass_deta;
+      edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : pass_dphi      : " << pass_dphi;
+      edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : pass_dz0       : " << pass_dz0;
+      edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : pass_trkpt     : " << pass_trkpt;
+      edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : pass_ovrl      : " << pass_ovrl;
     }
     // match conditions
     if (pass_deta && pass_dphi && pass_dz0 && pass_trkpt && pass_ovrl) {
       if (verbose_) {
-        cout << " [DEBUG compute_trk_iso] : THE TRACK WAS MATCHED" << endl;
-        cout << " [DEBUG compute_trk_iso] : RETURN         : " << in_trk.pt() << endl;
+        edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : THE TRACK WAS MATCHED";
+        edm::LogInfo("Isolation") << " [DEBUG compute_trk_iso] : RETURN         : " << in_trk.pt();
       }
 
       //return in_trk.pt();

L1Trigger/Phase2L1GMT/interface/Node.h

@@ -6,6 +6,7 @@
 #include "L1Trigger/Phase2L1GMT/interface/TrackMuonMatchAlgorithm.h"
 #include "L1Trigger/Phase2L1GMT/interface/Isolation.h"
 #include "L1Trigger/Phase2L1GMT/interface/Tauto3Mu.h"
+#include "DataFormats/L1TMuonPhase2/interface/TrackerMuon.h"
 
 namespace Phase2L1GMT {
 

L1Trigger/Phase2L1GMT/interface/PreTrackMatchedMuon.h

@@ -2,6 +2,18 @@
 #define PHASE2GMT_PRETRACKMATCHEDMUON
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "L1Trigger/Phase2L1GMT/interface/Constants.h"
+#include "DataFormats/L1TMuon/interface/RegionalMuonCandFwd.h"
+#include "DataFormats/L1TMuonPhase2/interface/MuonStub.h"
+#include "DataFormats/Common/interface/Ptr.h"
+#include "DataFormats/L1TrackTrigger/interface/TTTrack.h"
+#include "DataFormats/L1TrackTrigger/interface/TTStub.h"
+#include "DataFormats/L1TrackTrigger/interface/TTTypes.h"
+#include "DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h"
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+#include "DataFormats/L1Trigger/interface/Vertex.h"
+
+#include <vector>
 
 namespace Phase2L1GMT {
 
@@ -72,13 +84,13 @@ namespace Phase2L1GMT {
       stubs_.push_back(stub);
       if (stub->tfLayer() == 0)
         stubID0_ = stub->id();
-      if (stub->tfLayer() == 1)
+      else if (stub->tfLayer() == 1)
         stubID1_ = stub->id();
-      if (stub->tfLayer() == 2)
+      else if (stub->tfLayer() == 2)
         stubID2_ = stub->id();
-      if (stub->tfLayer() == 3)
+      else if (stub->tfLayer() == 3)
         stubID3_ = stub->id();
-      if (stub->tfLayer() == 4)
+      else if (stub->tfLayer() == 4)
         stubID4_ = stub->id();
     }
 

L1Trigger/Phase2L1GMT/interface/ROITempAssociator.h

@@ -37,7 +37,7 @@ namespace Phase2L1GMT {
           float phi = globalPhi * 2 * M_PI / 576.0;
           if (phi > (M_PI))
             phi = phi - 2 * M_PI;
-          if (phi < (-M_PI))
+          else if (phi < (-M_PI))
             phi = phi + 2 * M_PI;
 
           MuonROI roi(bx, charge, pt, 1);
@@ -54,7 +54,7 @@ namespace Phase2L1GMT {
               float deltaPhi = (stub->quality() & 0x1) ? stub->offline_coord1() - phi : stub->offline_coord2() - phi;
               if (deltaPhi > M_PI)
                 deltaPhi = deltaPhi - 2 * M_PI;
-              if (deltaPhi < -M_PI)
+              else if (deltaPhi < -M_PI)
                 deltaPhi = deltaPhi + 2 * M_PI;
               deltaPhi = fabs(deltaPhi);
               float deltaEta = (stub->etaQuality() == 0 || (stub->etaQuality() & 0x1))

L1Trigger/Phase2L1GMT/interface/Tauto3Mu.h

@@ -17,6 +17,7 @@
 #define PHASE2GMT_TAUTO3MU
 
 #include "L1Trigger/Phase2L1GMT/interface/TopologicalAlgorithm.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 namespace Phase2L1GMT {
   class Tauto3Mu : public TopoAlgo {

L1Trigger/Phase2L1GMT/interface/TopologicalAlgorithm.h

@@ -61,7 +61,7 @@ namespace Phase2L1GMT {
     static int nevti = 0;
     int totalsize = 0;
     // Current setting
-    int exptotal = 12 + 18 * 100;  // N_Muon + N_TRK_LINKS * NTRKperlinks
+    int constexpr exptotal = 12 + 18 * 100;  // N_Muon + N_TRK_LINKS * NTRKperlinks
     for (unsigned int i = 0; i < 12; ++i) {
       if (i < trkMus->size())
         dumpInput << " " << nevti << " 0 " << i << " " << trkMus->at(i).hwPt() * LSBpt << " "

L1Trigger/Phase2L1GMT/interface/TrackConverter.h

@@ -2,6 +2,7 @@
 #define PHASE2GMT_TRACKCONVERTER
 
 #include "L1Trigger/Phase2L1GMT/interface/ConvertedTTTrack.h"
+#include "DataFormats/L1TMuonPhase2/interface/TrackerMuon.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 namespace Phase2L1GMT {

L1Trigger/Phase2L1GMT/interface/TrackMuonMatchAlgorithm.h

@@ -13,6 +13,9 @@
 #include "L1Trigger/Phase2L1GMT/interface/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 <fstream>
 
 namespace Phase2L1GMT {
 

L1Trigger/Phase2L1GMT/plugins/BuildFile.xml

@@ -1,6 +1,7 @@
 <library   file="*.cc" name="Phase2L1GMTPlugins">
   <use name="DataFormats/L1TMuonPhase2"/>
   <use name="DataFormats/L1TMuon"/>
+  <use name="DataFormats/L1Trigger"/>
   <use name="SimGeneral/HepPDTRecord"/>
   <use name="DataFormats/L1TrackTrigger"/>
   <use name="DataFormats/L1TCorrelator"/>