PurgeDuplicates test-vectors (11_3_X)

L1Trigger/TrackFindingTracklet/interface/Settings.h

@@ -248,6 +248,13 @@ namespace trklet {
     unsigned int nbitstrackletindex() const { return nbitstrackletindex_; }
     void setNbitstrackletindex(unsigned int nbitstrackletindex) { nbitstrackletindex_ = nbitstrackletindex; }
 
+    unsigned int nbitsitc() const { return nbitsitc_; }
+    unsigned int nbitsseed() const { return (extended_ ? nbitsseedextended_ : nbitsseed_); }
+    unsigned int nbitstcindex() const { return nbitsseed() + nbitsitc(); }
+    void setNbitsitc(unsigned int nbitsitc) { nbitsitc_ = nbitsitc; }
+    void setNbitsseed(unsigned int nbitsseed) { nbitsseed_ = nbitsseed; }
+    void setNbitsseedextended(unsigned int nbitsseed) { nbitsseedextended_ = nbitsseed; }
+
     double dphisectorHG() const {
       return 2 * M_PI / N_SECTOR +
              2 * std::max(std::abs(asin(0.5 * rinvmax() * rmean(0)) - asin(0.5 * rinvmax() * rcrit_)),
@@ -450,6 +457,12 @@ namespace trklet {
 
     unsigned int nbitstrackletindex_{7};  //Bits used to store the tracklet index
 
+    unsigned int nbitsitc_{4};           //Bits used to store the iTC, a unique
+                                         //identifier assigned to each TC within a sector
+    unsigned int nbitsseed_{3};          //Bits used to store the seed number
+    unsigned int nbitsseedextended_{4};  //Bits used to store the seed number
+                                         //in the extended project
+
     //Bits used to store track parameter in tracklet
     int nbitsrinv_{14};
     int nbitsphi0_{18};

L1Trigger/TrackFindingTracklet/interface/Tracklet.h

@@ -470,7 +470,9 @@ namespace trklet {
                     int hitpattern,
                     const std::vector<const L1TStub*>& l1stubs = std::vector<const L1TStub*>());
 
-    std::string trackfitstr();
+    const std::string layerstubstr(const unsigned layer) const;
+    const std::string diskstubstr(const unsigned disk) const;
+    std::string trackfitstr() const;
 
     Track makeTrack(const std::vector<const L1TStub*>& l1stubs);
 
@@ -499,8 +501,11 @@ namespace trklet {
 
     int TCID() const { return TCIndex_ * (1 << settings_.nbitstrackletindex()) + trackletIndex_; }
 
-    int getISeed() const;
-    int getITC() const;
+    const int getISeed() const;
+    const int getITC() const;
+
+    void setTrackIndex(int index);
+    const int trackIndex() const;
 
     unsigned int PSseed() const { return ((layer() == 1) || (layer() == 2) || (disk() != 0)) ? 1 : 0; }
 
@@ -527,6 +532,7 @@ namespace trklet {
 
     int trackletIndex_;
     int TCIndex_;
+    int trackIndex_;
 
     //Tracklet track parameters
     TrackPars<FPGAWord> fpgapars_;

L1Trigger/TrackFindingTracklet/src/FitTrack.cc

@@ -996,6 +996,7 @@ void FitTrack::execute() {
       if (settings_.removalType() == "merge") {
         trackfit_->addStubList(trackstublist);
         trackfit_->addStubidsList(stubidslist);
+        bestTracklet->setTrackIndex(trackfit_->nTracks());
         trackfit_->addTrack(bestTracklet);
       } else if (bestTracklet->fit()) {
         assert(trackfit_ != nullptr);
@@ -1005,6 +1006,7 @@ void FitTrack::execute() {
                << endl;
           fout.close();
         }
+        bestTracklet->setTrackIndex(trackfit_->nTracks());
         trackfit_->addTrack(bestTracklet);
       }
     }