Cleanup of obsolete extended tracking code

L1Trigger/TrackFindingTracklet/interface/Sector.h

@@ -31,7 +31,6 @@ namespace trklet {
   class AllInnerStubsMemory;
   class VMStubsTEMemory;
   class VMStubsMEMemory;
-  class StubTripletsMemory;
   class TrackletParametersMemory;
   class TrackletProjectionsMemory;
   class FullMatchMemory;
@@ -43,7 +42,6 @@ namespace trklet {
   class VMRouterCM;
   class TrackletProcessor;
   class TrackletProcessorDisplaced;
-  class TrackletCalculatorDisplaced;
   class ProjectionCalculator;
   class VMStubMERouter;
   class MatchProcessor;
@@ -80,7 +78,6 @@ namespace trklet {
     void writeVMSME(bool first);
     void writeAS(bool first);
     void writeAIS(bool first);
-    void writeST(bool first);
     void writeTPAR(bool first);
     void writeTPROJ(bool first);
     void writeMC(bool first);
@@ -92,11 +89,8 @@ namespace trklet {
     // execute the different tracklet processing modules
     void executeIR();
     void executeVMR();
-    void executeTED();
-    void executeTRE();
     void executeTP();
     void executeTPD();
-    void executeTCD();
     void executePC();
     void executeVMSMER();
     void executeMP();
@@ -140,7 +134,6 @@ namespace trklet {
     std::vector<std::unique_ptr<AllInnerStubsMemory>> AIS_;
     std::vector<std::unique_ptr<VMStubsTEMemory>> VMSTE_;
     std::vector<std::unique_ptr<VMStubsMEMemory>> VMSME_;
-    std::vector<std::unique_ptr<StubTripletsMemory>> ST_;
     std::vector<std::unique_ptr<TrackletParametersMemory>> TPAR_;
     std::vector<std::unique_ptr<TrackletProjectionsMemory>> TPROJ_;
     std::vector<std::unique_ptr<FullMatchMemory>> FM_;
@@ -152,7 +145,6 @@ namespace trklet {
     std::vector<std::unique_ptr<VMRouterCM>> VMRCM_;
     std::vector<std::unique_ptr<TrackletProcessor>> TP_;
     std::vector<std::unique_ptr<TrackletProcessorDisplaced>> TPD_;
-    std::vector<std::unique_ptr<TrackletCalculatorDisplaced>> TCD_;
     std::vector<std::unique_ptr<ProjectionCalculator>> PC_;
     std::vector<std::unique_ptr<VMStubMERouter>> VMSMER_;
     std::vector<std::unique_ptr<MatchProcessor>> MP_;

L1Trigger/TrackFindingTracklet/interface/Settings.h

@@ -73,8 +73,6 @@ namespace trklet {
     std::string const& wiresFullPath() const { return edm::FileInPath(wiresFile()).fullPath(); }
     std::string const& wiresJSONFile() const { return wiresJSONFile_; }
     std::string const& wiresJSONFullPath() const { return edm::FileInPath(wiresJSONFile()).fullPath(); }
-    std::string const& tableTEDFile() const { return tableTEDFile_; }
-    std::string const& tableTREFile() const { return tableTREFile_; }
 
     void setFitPatternFile(const std::string& fitPatternFileName) { fitPatternFile_ = fitPatternFileName; }
     void setProcessingModulesFile(const std::string& processingModulesFileName) {
@@ -83,8 +81,6 @@ namespace trklet {
     void setMemoryModulesFile(const std::string& memoryModulesFileName) { memoryModulesFile_ = memoryModulesFileName; }
     void setWiresFile(const std::string& wiresFileName) { wiresFile_ = wiresFileName; }
     void setWiresJSONFile(const std::string& wiresJSONFileName) { wiresJSONFile_ = wiresJSONFileName; }
-    void setTableTEDFile(const std::string& tableTEDFileName) { tableTEDFile_ = tableTEDFileName; }
-    void setTableTREFile(const std::string& tableTREFileName) { tableTREFile_ = tableTREFileName; }
 
     unsigned int nndbitsstub(unsigned int layerdisk) const { return nndbitsstub_[layerdisk]; }
     unsigned int nzbitsstub(unsigned int layerdisk) const { return nzbitsstub_[layerdisk]; }
@@ -505,8 +501,6 @@ namespace trklet {
     std::string memoryModulesFile_;
     std::string wiresFile_;
     std::string wiresJSONFile_;
-    std::string tableTEDFile_;
-    std::string tableTREFile_;
 
     double rcrit_{55.0};  // critical radius for the hourglass configuration
 

L1Trigger/TrackFindingTracklet/interface/TrackletCalculatorDisplaced.h

@@ -3,8 +3,6 @@
 
 #include "L1Trigger/TrackFindingTracklet/interface/ProcessBase.h"
 #include "L1Trigger/TrackFindingTracklet/interface/TrackletProjectionsMemory.h"
-#include "L1Trigger/TrackFindingTracklet/interface/StubTripletsMemory.h"
-#include "L1Trigger/TrackFindingTracklet/interface/AllStubsMemory.h"
 #include "L1Trigger/TrackFindingTracklet/interface/TrackletParametersMemory.h"
 
 #include <vector>
@@ -23,13 +21,6 @@ namespace trklet {
 
     ~TrackletCalculatorDisplaced() override = default;
 
-    void addOutputProjection(TrackletProjectionsMemory*& outputProj, MemoryBase* memory);
-
-    void addOutput(MemoryBase* memory, std::string output) override;
-    void addInput(MemoryBase* memory, std::string input) override;
-
-    void execute(unsigned int iSector, double phimin, double phimax);
-
     void addDiskProj(Tracklet* tracklet, int disk);
     bool addLayerProj(Tracklet* tracklet, int layer);
 
@@ -172,11 +163,6 @@ namespace trklet {
     std::vector<double> toR_;
     std::vector<double> toZ_;
 
-    std::vector<AllStubsMemory*> innerallstubs_;
-    std::vector<AllStubsMemory*> middleallstubs_;
-    std::vector<AllStubsMemory*> outerallstubs_;
-    std::vector<StubTripletsMemory*> stubtriplets_;
-
     TrackletParametersMemory* trackletpars_;
 
     //First index is layer/disk second is phi region

L1Trigger/TrackFindingTracklet/interface/TrackletProcessorDisplaced.h

@@ -61,6 +61,10 @@ namespace trklet {
 
     std::vector<VMStubsTEMemory*> innervmstubs_;
     std::vector<VMStubsTEMemory*> outervmstubs_;
+
+    std::vector<AllStubsMemory*> innerallstubs_;
+    std::vector<AllStubsMemory*> middleallstubs_;
+    std::vector<AllStubsMemory*> outerallstubs_;
   };
 
 };  // namespace trklet

L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc

@@ -156,9 +156,6 @@ class L1FPGATrackProducer : public edm::one::EDProducer<edm::one::WatchRuns> {
   std::string wiresFile;
   std::string wiresJSONFile;
 
-  edm::FileInPath tableTEDFile;
-  edm::FileInPath tableTREFile;
-
   std::string asciiEventOutName_;
   std::ofstream asciiEventOut_;
 
@@ -270,11 +267,6 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
   reduced_ = iConfig.getParameter<bool>("Reduced");
   nHelixPar_ = iConfig.getParameter<unsigned int>("Hnpar");
 
-  if (extended_) {
-    tableTEDFile = iConfig.getParameter<edm::FileInPath>("tableTEDFile");
-    tableTREFile = iConfig.getParameter<edm::FileInPath>("tableTREFile");
-  }
-
   // --------------------------------------------------------------------------------
   // set options in Settings based on inputs from configuration files
   // --------------------------------------------------------------------------------
@@ -298,14 +290,10 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
   settings_.setDoMultipleMatches(iConfig.getParameter<bool>("DoMultipleMatches"));
 
   if (extended_) {
-    settings_.setTableTEDFile(tableTEDFile.fullPath());
-    settings_.setTableTREFile(tableTREFile.fullPath());
-
     settings_.setNumTracksComparedPerBin(9999);
 
-    //FIXME: The TED and TRE tables are currently disabled by default, so we
-    //need to allow for the additional tracklets that will eventually be
-    //removed by these tables, once they are finalized
+    //FIXME: We need to allow for the additional tracklets that will eventually
+    //       be removed by lookup tables, once they are finalized
     settings_.setNbitstrackletindex(15);
   }
 
@@ -321,10 +309,6 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
 #endif
         << "\n process modules : " << processingModulesFile << "\n memory modules :  " << memoryModulesFile
         << "\n wires          :  " << wiresFile;
-    if (extended_) {
-      edm::LogVerbatim("Tracklet") << "table_TED    :  " << tableTEDFile.fullPath()
-                                   << "\n table_TRE    :  " << tableTREFile.fullPath();
-    }
   }
   if (settings_.storeTrackBuilderOutput() && (settings_.doMultipleMatches() || !settings_.removalType().empty())) {
     cms::Exception exception("ConfigurationNotSupported.");

L1Trigger/TrackFindingTracklet/python/l1tTTTracksFromTrackletEmulation_cfi.py

@@ -47,9 +47,6 @@
                                                Extended = cms.bool(True),
                                                Reduced = cms.bool(False),
                                                Hnpar = cms.uint32(5),
-                                               # specifying where the TrackletEngineDisplaced(TED)/TripletEngine(TRE) tables are located
-                                               tableTEDFile = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/table_TED/table_TED_D1PHIA1_D2PHIA1.txt'),
-                                               tableTREFile = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/table_TRE/table_TRE_D1AD2A_1.txt'),
                                                # Quality Flag and Quality params
                                                TrackQuality = cms.bool(False)
     )

L1Trigger/TrackFindingTracklet/src/Sector.cc

@@ -9,7 +9,6 @@
 #include "L1Trigger/TrackFindingTracklet/interface/AllInnerStubsMemory.h"
 #include "L1Trigger/TrackFindingTracklet/interface/VMStubsTEMemory.h"
 #include "L1Trigger/TrackFindingTracklet/interface/VMStubsMEMemory.h"
-#include "L1Trigger/TrackFindingTracklet/interface/StubTripletsMemory.h"
 #include "L1Trigger/TrackFindingTracklet/interface/TrackletParametersMemory.h"
 #include "L1Trigger/TrackFindingTracklet/interface/TrackletProjectionsMemory.h"
 #include "L1Trigger/TrackFindingTracklet/interface/FullMatchMemory.h"
@@ -20,7 +19,6 @@
 #include "L1Trigger/TrackFindingTracklet/interface/VMRouterCM.h"
 #include "L1Trigger/TrackFindingTracklet/interface/TrackletProcessor.h"
 #include "L1Trigger/TrackFindingTracklet/interface/TrackletProcessorDisplaced.h"
-#include "L1Trigger/TrackFindingTracklet/interface/TrackletCalculatorDisplaced.h"
 #include "L1Trigger/TrackFindingTracklet/interface/ProjectionCalculator.h"
 #include "L1Trigger/TrackFindingTracklet/interface/VMStubMERouter.h"
 #include "L1Trigger/TrackFindingTracklet/interface/MatchProcessor.h"
@@ -107,8 +105,6 @@ void Sector::addMem(const string& memType, const string& memName) {
     addMemToVec(VMSTE_, memName, settings_);
   } else if (memType == "VMStubsME:") {
     addMemToVec(VMSME_, memName, settings_);
-  } else if (memType == "StubTriplets:") {
-    addMemToVec(ST_, memName, settings_);
   } else if (memType == "TrackletParameters:") {
     addMemToVec(TPAR_, memName, settings_);
   } else if (memType == "TrackletProjections:") {
@@ -134,8 +130,6 @@ void Sector::addProc(const string& procType, const string& procName) {
     addProcToVec(TP_, procName, settings_, globals_);
   } else if (procType == "TrackletProcessorDisplaced:") {
     addProcToVec(TPD_, procName, settings_, globals_);
-  } else if (procType == "TrackletCalculatorDisplaced:") {
-    addProcToVec(TCD_, procName, settings_, globals_);
   } else if (procType == "ProjectionCalculator:") {
     addProcToVec(PC_, procName, settings_, globals_);
   } else if (procType == "VMStubMERouter:") {
@@ -232,12 +226,6 @@ void Sector::writeAIS(bool first) {
   }
 }
 
-void Sector::writeST(bool first) {
-  for (auto& i : ST_) {
-    i->writeST(first, isector_);
-  }
-}
-
 void Sector::writeTPAR(bool first) {
   for (auto& i : TPAR_) {
     i->writeTPAR(first, isector_);
@@ -304,12 +292,6 @@ void Sector::executeTPD() {
   }
 }
 
-void Sector::executeTCD() {
-  for (auto& i : TCD_) {
-    i->execute(isector_, phimin_, phimax_);
-  }
-}
-
 void Sector::executePC() {
   for (auto& i : PC_) {
     i->execute(isector_, phimin_);