Several improvements to L1 tracking code

L1Trigger/TrackFindingTracklet/README.md

@@ -1,4 +1,4 @@
-To run the L1 tracking & create a TTree of tracking performance: 
+To run the L1 tracking & create a TTree of tracking performance:
 
 cmsRun L1TrackNtupleMaker_cfg.py
 

L1Trigger/TrackFindingTracklet/interface/ProcessBase.h

@@ -31,6 +31,10 @@ namespace trklet {
 
     //This function processes the name of a TE module to determine the layerdisks and iseed
     void initLayerDisksandISeed(unsigned int& layerdisk1, unsigned int& layerdisk2, unsigned int& iSeed);
+    void initLayerDisksandISeedDisp(unsigned int& layerdisk1,
+                                    unsigned int& layerdisk2,
+                                    unsigned int& layerdisk3,
+                                    unsigned int& iSeed);
 
     unsigned int getISeed(const std::string& name);
 

L1Trigger/TrackFindingTracklet/interface/Settings.h

@@ -267,6 +267,13 @@ namespace trklet {
 
     bool extended() const { return extended_; }
     void setExtended(bool extended) { extended_ = extended; }
+    bool duplicateMPs() const { return duplicateMPs_; }
+    const std::array<bool, N_LAYER + N_DISK>& layersDisksDuplicatedEqualProjBalance() const {
+      return layersDisksDuplicatedEqualProjBalance_;
+    }
+    const std::array<bool, N_LAYER + N_DISK>& layersDisksDuplicatedWeightedProjBalance() const {
+      return layersDisksDuplicatedWeightedProjBalance_;
+    }
     bool combined() const { return combined_; }
     void setCombined(bool combined) { combined_ = combined; }
     bool reduced() const { return reduced_; }
@@ -890,6 +897,7 @@ namespace trklet {
         {"TB", 108},
         {"MP", 108},
         {"TP", 108},
+        {"TPD", 108},
         {"TRE", 108},
         {"DR", 108}};  //Specifies how many tracks allowed per bin in DR
 
@@ -1028,11 +1036,33 @@ namespace trklet {
     bool reduced_{false};        // use reduced (Summer Chain) config
     bool inventStubs_{false};    // invent seeding stub coordinates based on tracklet traj
 
-    // Use combined TP (TE+TC) and MP (PR+ME+MC) configuration (with prompt tracking)
-    bool combined_{false};
-    // N.B. To use combined modules with extended tracking, edit
-    // Tracklet_cfi.py to refer to *_hourglassExtendedCombined.dat,
-    // but leave combined_=false.
+    // Use combined TP (TE+TC) & MP (PR+ME+MC) config (with prompt tracking)
+    bool combined_{true};
+    // N.B. For extended tracking, this combined_ is overridden by python cfg
+    // to false, but combined modules are nonetheless used by default.
+    // If you don't want them, edit l1tTTTracksFromTrackletEmulation_cfi.py
+    // to refer to *_hourglassExtended.dat .
+
+    // Use chain with duplicated MPs for L3,L4 to reduce truncation issue
+    // Balances load from projections roughly in half for each of the two MPs
+    bool duplicateMPs_{false};
+
+    // Determines which layers, disks the MatchProcessor is duplicated for
+    // (note: in TCB by default always duplicated for phi B, C as truncation is significantly worse than A, D)
+    // All layers, disks disabled by default, also is overwritten by above duplicateMPs bool
+
+    // EqualProjBalancing is for layers for which the projections to each duplicated MP are split in half sequentially
+    std::array<bool, N_LAYER + N_DISK> layersDisksDuplicatedEqualProjBalance_{
+        {false, false, false, false, false, false, false, false, false, false, false}};
+
+    // Weighted proj balancing is for specifically L4, L5 where the split of the projections is weighted to account for
+    // Higher occupancy in the L1L2 seed to minimize truncation
+    std::array<bool, N_LAYER + N_DISK> layersDisksDuplicatedWeightedProjBalance_{
+        {false, false, false, false, false, false, false, false, false, false, false}};
+
+    // Example use where for L3, L4, L5, D2, D3, the layers/disks where truncation is worst
+    //std::array<bool, N_LAYER + N_DISK> layersDisksDuplicatedEqualProjBalance_{{0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0}};
+    //std::array<bool, N_LAYER + N_DISK> layersDisksDuplicatedWeightedProjBalance_{{0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0}};
 
     std::string skimfile_{""};  //if not empty events will be written out in ascii format to this file
 

L1Trigger/TrackFindingTracklet/interface/TrackletConfigBuilder.h

@@ -232,6 +232,7 @@ namespace trklet {
     unsigned int NSector_;  //Number of sectors
     double rcrit_;          //critical radius that defines the sector
 
+    bool duplicateMPs_;     //if true write configuration with MPs duplicated for L3,L4
     bool combinedmodules_;  //if true write configuration for combined modules
 
     bool extended_;  //if true write configuration for extended configuration

L1Trigger/TrackFindingTracklet/interface/TrackletLUT.h

@@ -102,7 +102,7 @@ namespace trklet {
 
     //In the VMR we used the position of the stub (r, z) to calculate the bin and fine rz position the stub has
     //region only used for name - should be removed
-    void initVMRTable(unsigned int layerdisk, VMRTableType type, int region = -1);
+    void initVMRTable(unsigned int layerdisk, VMRTableType type, int region = -1, bool combined = true);
 
     //Used in barrel to calculate the phi position of a stub at the nominal radis of the layer based on the stub radial
     //psotion and bend
@@ -116,6 +116,8 @@ namespace trklet {
 
     unsigned int size() const { return table_.size(); }
 
+    unsigned int nbits() const { return nbits_; }
+
   private:
     const Settings& settings_;
     const tt::Setup* setup_;

L1Trigger/TrackFindingTracklet/interface/TrackletProcessorDisplaced.h

@@ -40,17 +40,10 @@ namespace trklet {
 
   private:
     int iTC_;
-    int iAllStub_;
-    unsigned int maxStep_;
-    int count_;
-    unsigned int layerdisk_;
-
-    int layer1_;
-    int layer2_;
-    int layer3_;
-    int disk1_;
-    int disk2_;
-    int disk3_;
+
+    unsigned int layerdisk1_;
+    unsigned int layerdisk2_;
+    unsigned int layerdisk3_;
 
     int firstphibits_;
     int secondphibits_;
@@ -59,20 +52,11 @@ namespace trklet {
     int nbitszfinebintable_;
     int nbitsrfinebintable_;
 
-    TrackletLUT innerTable_;         //projection to next layer/disk
-    TrackletLUT innerOverlapTable_;  //projection to disk from layer
-    TrackletLUT innerThirdTable_;    //projection to disk1 for extended - iseed=10
+    TrackletLUT innerTable_;       //projection to next layer/disk
+    TrackletLUT innerThirdTable_;  //projection to third disk/layer
 
-    std::vector<StubPairsMemory*> stubpairs_;
-    /* std::vector<StubTripletsMemory*> stubtriplets_; */
     std::vector<VMStubsTEMemory*> innervmstubs_;
     std::vector<VMStubsTEMemory*> outervmstubs_;
-
-    StubTripletsMemory* stubtriplets_;
-
-    std::map<std::string, std::vector<std::vector<std::string> > > tmpSPTable_;
-    std::map<std::string, std::vector<std::map<std::string, unsigned> > > spTable_;
-    std::vector<bool> table_;
   };
 
 };  // namespace trklet

L1Trigger/TrackFindingTracklet/interface/VMRouterCM.h

@@ -22,11 +22,18 @@ namespace trklet {
   class VMStubsTEMemory;
 
   struct VMStubsTEPHICM {
-    VMStubsTEPHICM(unsigned int seednumber_, std::vector<VMStubsTEMemory*> vmstubmem_)
-        : seednumber(seednumber_), vmstubmem(vmstubmem_) {}
-
-    unsigned int seednumber;                  //seed number [0,11]
-    std::vector<VMStubsTEMemory*> vmstubmem;  // m_vmstubmem[n] is the VMStubsTEMemory for the nth copy
+    VMStubsTEPHICM(unsigned int seednumber_,
+                   unsigned int stubposition_,
+                   const std::vector<std::vector<VMStubsTEMemory*> >& vmstubmem_)
+        : seednumber(seednumber_), stubposition(stubposition_), vmstubmem(vmstubmem_) {};
+
+    unsigned int seednumber;    //seed number [0,11]
+    unsigned int stubposition;  //stub position in the seed (only used by triplet seeds)
+
+    // The first index in the following 2D vector is only used in the case of
+    // the triplet seeds.
+    std::vector<std::vector<VMStubsTEMemory*> >
+        vmstubmem;  // m_vmstubmem[iVM][n] is the VMStubsTEMemory for iVM and the nth copy
   };
 
   class VMRouterCM : public ProcessBase {
@@ -57,6 +64,14 @@ namespace trklet {
     TrackletLUT meTable_;    //used for ME and outer TE barrel
     TrackletLUT diskTable_;  //outer disk used by D1, D2, and D4
 
+    // The following tables are only used to replicate the behavior of the old
+    // VMRouter in the case of the triplet seeds.
+    TrackletLUT meTableOld_;         //used for ME and outer TE barrel
+    TrackletLUT diskTableOld_;       //outer disk used by D1, D2, and D4
+    TrackletLUT innerTable_;         //projection to next layer/disk
+    TrackletLUT innerOverlapTable_;  //projection to disk from layer
+    TrackletLUT innerThirdTable_;    //projection to disk1 for extended - iseed=10
+
     //The input stub memories
     std::vector<InputLinkMemory*> stubinputs_;
 

L1Trigger/TrackFindingTracklet/interface/VMStubsTEMemory.h

@@ -23,7 +23,7 @@ namespace trklet {
 
     void resize(int nbins) { stubsbinnedvm_.resize(nbins); }
 
-    bool addVMStub(VMStubTE vmstub, int bin);
+    bool addVMStub(VMStubTE vmstub, int bin, int ivmte = 0, bool combined = true);
 
     bool addVMStub(VMStubTE vmstub);
 

L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc

@@ -153,7 +153,9 @@ class L1FPGATrackProducer : public edm::one::EDProducer<edm::one::WatchRuns> {
   bool readMoreMcTruth_;
 
   /// File path for configuration files
+#ifndef USEHYBRID
   edm::FileInPath fitPatternFile;
+#endif
   edm::FileInPath memoryModulesFile;
   edm::FileInPath processingModulesFile;
   edm::FileInPath wiresFile;
@@ -254,7 +256,6 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
 
   asciiEventOutName_ = iConfig.getUntrackedParameter<string>("asciiFileName", "");
 
-  fitPatternFile = iConfig.getParameter<edm::FileInPath>("fitPatternFile");
   processingModulesFile = iConfig.getParameter<edm::FileInPath>("processingModulesFile");
   memoryModulesFile = iConfig.getParameter<edm::FileInPath>("memoryModulesFile");
   wiresFile = iConfig.getParameter<edm::FileInPath>("wiresFile");
@@ -282,7 +283,10 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
   settings_.setReduced(reduced_);
   settings_.setNHelixPar(nHelixPar_);
 
+#ifndef USEHYBRID
+  fitPatternFile = iConfig.getParameter<edm::FileInPath>("fitPatternFile");
   settings_.setFitPatternFile(fitPatternFile.fullPath());
+#endif
   settings_.setProcessingModulesFile(processingModulesFile.fullPath());
   settings_.setMemoryModulesFile(memoryModulesFile.fullPath());
   settings_.setWiresFile(wiresFile.fullPath());
@@ -308,10 +312,12 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
   }
 
   if (settings_.debugTracklet()) {
-    edm::LogVerbatim("Tracklet") << "fit pattern :     " << fitPatternFile.fullPath()
-                                 << "\n process modules : " << processingModulesFile.fullPath()
-                                 << "\n memory modules :  " << memoryModulesFile.fullPath()
-                                 << "\n wires          :  " << wiresFile.fullPath();
+    edm::LogVerbatim("Tracklet")
+#ifndef USEHYBRID
+        << "fit pattern :     " << fitPatternFile.fullPath()
+#endif
+        << "\n process modules : " << processingModulesFile.fullPath()
+        << "\n memory modules :  " << memoryModulesFile.fullPath() << "\n wires          :  " << wiresFile.fullPath();
     if (extended_) {
       edm::LogVerbatim("Tracklet") << "table_TED    :  " << tableTEDFile.fullPath()
                                    << "\n table_TRE    :  " << tableTREFile.fullPath();
@@ -750,9 +756,6 @@ void L1FPGATrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe
     //      trackQualityModel_->setBonusFeatures(hph.bonusFeatures());
     //    }
 
-    // test track word
-    //aTrack.testTrackWordBits();
-
     // set track word again to set MVA variable from TTTrack into track word
     aTrack.setTrackWordBits();
     // test track word