Updating Stub Format for VMSMERouter Changes

L1Trigger/TrackFindingTMTT/src/KFbase.cc

@@ -551,7 +551,7 @@ namespace tmtt {
       matRinv = TMatrixD(TMatrixD::kInverted, matR);
     } else {
       // Protection against rare maths instability.
-      const TMatrixD unitMatrix(TMatrixD::kUnit, TMatrixD(nHelixPar_, nHelixPar_));
+      const TMatrixD unitMatrix(TMatrixD::kUnit, TMatrixD(2, 2));
       const double big = 9.9e9;
       matRinv = big * unitMatrix;
     }

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/Settings.h

@@ -88,6 +88,7 @@ namespace trklet {
     void setTableTEDFile(std::string tableTEDFileName) { tableTEDFile_ = tableTEDFileName; }
     void setTableTREFile(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]; }
     unsigned int nphibitsstub(unsigned int layerdisk) const { return nphibitsstub_[layerdisk]; }
     unsigned int nrbitsstub(unsigned int layerdisk) const { return nrbitsstub_[layerdisk]; }
@@ -170,12 +171,11 @@ namespace trklet {
     double rphicut2S(unsigned int iSeed, unsigned int idisk) const { return rphicut2S_[idisk][iSeed]; }
     double rcut2S(unsigned int iSeed, unsigned int idisk) const { return rcut2S_[idisk][iSeed]; }
 
-
     unsigned int irmean(unsigned int iLayer) const { return irmean_[iLayer]; }
     double rmean(unsigned int iLayer) const { return irmean_[iLayer] * rmaxdisk_ / 4096; }
     double rmax(unsigned int iLayer) const { return rmean(iLayer) + drmax(); }
     double rmin(unsigned int iLayer) const { return rmean(iLayer) - drmax(); }
-    unsigned int izmean(unsigned int iDisk) const { return izmean_[iDisk]; }    
+    unsigned int izmean(unsigned int iDisk) const { return izmean_[iDisk]; }
     double zmean(unsigned int iDisk) const { return izmean_[iDisk] * zlength_ / 2048; }
     double zmax(unsigned int iDisk) const { return zmean(iDisk) + dzmax(); }
     double zmin(unsigned int iDisk) const { return zmean(iDisk) - dzmax(); }
@@ -344,7 +344,9 @@ namespace trklet {
 
     double kz() const { return 2.0 * zlength_ / (1 << nzbitsstub_[0]); }
     double kz(unsigned int layerdisk) const { return 2.0 * zlength_ / (1 << nzbitsstub_[layerdisk]); }
-    double kr() const { return rmaxdisk_ / (1 << nrbitsstub_[N_LAYER]); }
+    double kr() const {
+      return rmaxdisk_ / (1 << (nrbitsstub_[N_LAYER] + 1));
+    }  // + 1 required to offset artificial decrease in # of diskps r bits from 12 -> 11 to make space for negDisk bit
     double krbarrel() const { return 2.0 * drmax() / (1 << nrbitsstub_[0]); }
 
     double maxrinv() const { return maxrinv_; }
@@ -527,9 +529,10 @@ namespace trklet {
     std::array<unsigned int, N_LAYER> irmean_{{851, 1269, 1784, 2347, 2936, 3697}};
     std::array<unsigned int, N_DISK> izmean_{{2239, 2645, 3163, 3782, 4523}};
 
+    std::array<unsigned int, N_LAYER + N_DISK> nndbitsstub_{{0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1}};
     std::array<unsigned int, N_LAYER + N_DISK> nzbitsstub_{{12, 12, 12, 8, 8, 8, 7, 7, 7, 7, 7}};
     std::array<unsigned int, N_LAYER + N_DISK> nphibitsstub_{{14, 14, 14, 17, 17, 17, 14, 14, 14, 14, 14}};
-    std::array<unsigned int, N_LAYER + N_DISK> nrbitsstub_{{7, 7, 7, 7, 7, 7, 12, 12, 12, 12, 12}};
+    std::array<unsigned int, N_LAYER + N_DISK> nrbitsstub_{{7, 7, 7, 7, 7, 7, 11, 11, 11, 11, 11}};
 
     unsigned int nrbitsprojderdisk_{9};
     unsigned int nbitsphiprojderL123_{10};
@@ -1051,18 +1054,23 @@ namespace trklet {
     double stripLength_PS_{0.1467};
     double stripLength_2S_{5.0250};
 
+    // The DR binning below disabled, as doesn't match latest FW.
+
     //Following values are used for duplicate removal
     //Rinv bins were optimised to ensure a similar number of tracks in each bin prior to DR
     //Rinv bin edges for 6 bins.
-    std::vector<double> rinvBins_{-rinvcut(), -0.004968, -0.003828, 0, 0.003828, 0.004968, rinvcut()};
+    //std::vector<double> rinvBins_{-rinvcut(), -0.004968, -0.003828, 0, 0.003828, 0.004968, rinvcut()};
+    std::vector<double> rinvBins_{-rinvcut(), rinvcut()};
     //Phi bin edges for 2 bins.
-    std::vector<double> phiBins_{0, dphisectorHG() / 2, dphisectorHG()};
+    //std::vector<double> phiBins_{0, dphisectorHG() / 2, dphisectorHG()};
+    std::vector<double> phiBins_{0, dphisectorHG()};
     //Overlap size for the overlap rinv bins in DR
     double rinvOverlapSize_{0.0004};
     //Overlap size for the overlap phi bins in DR
     double phiOverlapSize_{M_PI / 360};
     //The maximum number of tracks that are compared to all the other tracks per rinv bin
-    int numTracksComparedPerBin_{32};
+    //int numTracksComparedPerBin_{32};
+    int numTracksComparedPerBin_{9999};
 
     double sensorSpacing_2S_{0.18};
   };

L1Trigger/TrackFindingTracklet/interface/Stub.h

@@ -30,9 +30,10 @@ namespace trklet {
         return r_.str() + "|" + z_.str() + "|" + phi_.str() + "|" + bend_.str();
       } else {
         if (isPSmodule()) {
-          return r_.str() + "|" + z_.str() + "|" + phi_.str() + "|" + bend_.str();
+          return negdisk_.str() + "|" + r_.str() + "|" + z_.str() + "|" + phi_.str() + "|" + bend_.str();
         } else {
-          return "000" + r_.str() + "|" + z_.str() + "|" + phi_.str() + "|" + alpha_.str() + "|" + bend_.str();
+          return negdisk_.str() + "|" + "00" + r_.str() + "|" + z_.str() + "|" + phi_.str() + "|" + alpha_.str() + "|" +
+                 bend_.str();
         }
       }
     }
@@ -43,11 +44,7 @@ namespace trklet {
       unsigned int nbitsfinephi = 8;
       FPGAWord finephi(
           phicorr_.bits(phicorr_.nbits() - nbitsfinephi, nbitsfinephi), nbitsfinephi, true, __LINE__, __FILE__);
-      if (layer_.value() == -1) {
-        return str() + "|" + negdisk_.str() + "|" + stubindex_.str() + "|" + finephi.str();
-      } else {
-        return str() + "|" + stubindex_.str() + "|" + finephi.str();
-      }
+      return str() + "|" + stubindex_.str() + "|" + finephi.str();
     }
 
     FPGAWord allStubIndex() const { return stubindex_; }
@@ -62,6 +59,10 @@ namespace trklet {
 
     const FPGAWord& bend() const { return bend_; }
 
+    const int rvalue() const {
+      return (layerdisk_ < N_LAYER) ? r_.value() : (r_.value() > 10) ? r_.value() + (1 << r_offset_bits) : r_.value();
+    }
+
     const FPGAWord& r() const { return r_; }
     const FPGAWord& z() const { return z_; }
     const FPGAWord& negdisk() const { return negdisk_; }
@@ -103,6 +104,8 @@ namespace trklet {
 
     FPGAWord stubindex_;
 
+    int r_offset_bits;
+
     L1TStub* l1tstub_;
     Settings const& settings_;
   };

L1Trigger/TrackFindingTracklet/interface/Tracklet.h

@@ -221,6 +221,8 @@ namespace trklet {
 
     unsigned int PSseed() const { return ((layer() == 1) || (layer() == 2) || (disk() != 0)) ? 1 : 0; }
 
+    // Seed type:
+    //  L1L2=0,L2L3=1,L3L4=2,L5L6=3,D1D2=4,D3D4=5,L1D1=6,L2D1=7
     unsigned int seedIndex() const { return seedIndex_; }
 
   private:

L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc

@@ -154,7 +154,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;
@@ -255,7 +257,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,8 +283,15 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
   settings_.setExtended(extended_);
   settings_.setReduced(reduced_);
   settings_.setNHelixPar(nHelixPar_);
+  // combined_ must be false for extended tracking, regardless of whether
+  // combined modules are used or not.
+  if (extended_)
+    settings_.setCombined(false);
 
+#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());
@@ -309,10 +317,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();

L1Trigger/TrackFindingTracklet/python/Customize_cff.py

@@ -27,3 +27,7 @@ def reducedConfig(process):
   process.l1tTTTracksFromTrackletEmulation.memoryModulesFile = 'L1Trigger/TrackFindingTracklet/data/reduced_memorymodules.dat'
   process.l1tTTTracksFromTrackletEmulation.processingModulesFile = 'L1Trigger/TrackFindingTracklet/data/reduced_processingmodules.dat'
   process.l1tTTTracksFromTrackletEmulation.wiresFile = 'L1Trigger/TrackFindingTracklet/data/reduced_wires.dat'
+
+# configures pure tracklet algorithm (as opposed to Hybrid algorithm)
+def trackletConfig(process):
+    process.l1tTTTracksFromTrackletEmulation.fitPatternFile = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/fitpattern.txt') 

L1Trigger/TrackFindingTracklet/python/l1tTTTracksFromTrackletEmulation_cfi.py

@@ -15,11 +15,10 @@
                                                Extended = cms.bool(False),
                                                Reduced = cms.bool(False),
                                                Hnpar = cms.uint32(4),
-                                               # (if running on CRAB use "../../fitpattern.txt" etc instead)
-                                               fitPatternFile = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/fitpattern.txt'),
-                                               memoryModulesFile = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/memorymodules_hourglassExtended.dat'),
-                                               processingModulesFile = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/processingmodules_hourglassExtended.dat'),
-                                               wiresFile = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/wires_hourglassExtended.dat'),
+                                               # These 3 files only used for extended or reduced mode.
+                                               memoryModulesFile = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/memorymodules_hourglassExtendedCombined.dat'),
+                                               processingModulesFile = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/processingmodules_hourglassExtendedCombined.dat'),
+                                               wiresFile = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/wires_hourglassExtendedCombined.dat'),
                                                # Quality Flag and Quality params
                                                TrackQuality = cms.bool(True),
                                                TrackQualityPSet = cms.PSet(TrackQualityParams),
@@ -39,4 +38,4 @@
                                                # Quality Flag and Quality params
                                                TrackQuality = cms.bool(False),
                                                TrackQualityPSet = cms.PSet(TrackQualityParams)
-    )
+    )

L1Trigger/TrackFindingTracklet/src/FitTrack.cc

@@ -136,7 +136,8 @@ void FitTrack::trackFitKF(Tracklet* tracklet,
     }
   }
 }
-#endif
+
+#else  // Code for pure Tracklet algo.
 
 void FitTrack::trackFitChisq(Tracklet* tracklet, std::vector<const Stub*>&, std::vector<std::pair<int, int>>&) {
   if (globals_->trackDerTable() == nullptr) {
@@ -788,6 +789,8 @@ void FitTrack::trackFitChisq(Tracklet* tracklet, std::vector<const Stub*>&, std:
                        0);
 }
 
+#endif
+
 void FitTrack::trackFitFake(Tracklet* tracklet, std::vector<const Stub*>&, std::vector<std::pair<int, int>>&) {
   tracklet->setFitPars(tracklet->rinvapprox(),
                        tracklet->phi0approx(),

L1Trigger/TrackFindingTracklet/src/MatchProcessor.cc

@@ -194,6 +194,12 @@ void MatchProcessor::execute(unsigned int iSector, double phimin) {
   unsigned int countsel = 0;
   unsigned int countinputproj = 0;
 
+  //for (unsigned int i=0; i<inputprojs_.size(); i++) {
+  //  for (unsigned int p=0; p<inputprojs_[i]->nPage(); p++) {
+  //    std::cout << "ProjOcc: " << inputprojs_[i]->getName() << " " << p << " " << inputprojs_[i]->nTracklets(p) << std::endl;
+  //  }
+  //}
+
   unsigned int iprojmem = 0;
   unsigned int page = 0;
   while (iprojmem < inputprojs_.size() && inputprojs_[iprojmem]->nTracklets(page) == 0) {
@@ -511,7 +517,7 @@ bool MatchProcessor::matchCalculator(Tracklet* tracklet, const Stub* fpgastub, b
 
   if (layerdisk_ < N_LAYER) {
     const Projection& proj = tracklet->proj(layerdisk_);
-    int ir = fpgastub->r().value();
+    int ir = fpgastub->rvalue();
     int iphi = proj.fpgaphiproj().value();
     int icorr = (ir * proj.fpgaphiprojder().value()) >> icorrshift_;
     iphi += icorr;
@@ -675,7 +681,7 @@ bool MatchProcessor::matchCalculator(Tracklet* tracklet, const Stub* fpgastub, b
 
     int ideltaphi = fpgastub->phi().value() - iphi;
 
-    int irstub = fpgastub->r().value();
+    int irstub = fpgastub->rvalue();
     int ialphafact = 0;
     if (!stub->isPSmodule()) {
       assert(irstub < (int)N_DSS_MOD * 2);
@@ -780,7 +786,7 @@ bool MatchProcessor::matchCalculator(Tracklet* tracklet, const Stub* fpgastub, b
     }
 
     bool match = (std::abs(drphi) < drphicut) && (std::abs(deltar) < drcut);
-    bool imatch = (std::abs(ideltaphi * irstub) < best_ideltaphi_disk) && (std::abs(ideltar) < best_ideltar_disk);
+    bool imatch = (std::abs(ideltaphi * irstub) < idrphicut) && (std::abs(ideltar) < idrcut);
 
     if (settings_.debugTracklet()) {
       edm::LogVerbatim("Tracklet") << "imatch match disk: " << imatch << " " << match << " " << std::abs(ideltaphi)

L1Trigger/TrackFindingTracklet/src/Projection.cc

@@ -32,7 +32,11 @@ void Projection::init(Settings const& settings,
   if (layerdisk < N_LAYER) {
     fpgarzproj_.set(irzproj, settings.nzbitsstub(layerdisk), false, __LINE__, __FILE__);
   } else {
-    fpgarzproj_.set(irzproj, settings.nrbitsstub(layerdisk), false, __LINE__, __FILE__);
+    fpgarzproj_.set(irzproj,
+                    settings.nrbitsstub(layerdisk) + 1,
+                    false,
+                    __LINE__,
+                    __FILE__);  // + 1 to account for artificially reduced nrbits from r value offset for diskps stubs
   }
 
   if (layerdisk < N_LAYER) {