Some more cleanup

cms-L1TK · Jan 3, 2025 · 0cce4a0 · 0cce4a0
1 parent 4a0885d
commit 0cce4a0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 30 deletions.
diff --git a/L1Trigger/TrackFindingTracklet/interface/Settings.h b/L1Trigger/TrackFindingTracklet/interface/Settings.h
@@ -542,12 +542,6 @@ namespace trklet {
 
     std::array<unsigned int, N_LAYER + N_DISK> nbitsallstubs_{{3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2}};
     std::array<unsigned int, N_LAYER + N_DISK> nbitsvmme_{{2, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2}};
-    std::array<std::array<unsigned int, N_SEED>, 3> nbitsvmte_{
-        //FIXME unused?
-        {{{2, 2, 2, 2, 2, 2, 1, 1, 2, 2, 3, 2}},  // (3 = #stubs/triplet, only row 1+2 used for tracklet)
-         {{3, 2, 3, 3, 2, 2, 2, 2, 3, 3, 2, 2}},
-         {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}}}};
-
     std::array<std::array<unsigned int, N_SEED>, 3> nbitsvmtecm_{
         {{{2, 2, 2, 2, 2, 2, 1, 1, 2, 2, 3, 2}},  // (3 = #stubs/triplet, only row 1+2 used for tracklet)
          {{3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2}},
@@ -676,13 +670,6 @@ namespace trklet {
          {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3}}}};  //outermost (triplets only)
 
     //These are the number of bits used for the VM regions in the TE by seedindex
-    //FIXME not independed nbitsvmte
-    std::array<std::array<unsigned int, N_SEED>, 3> nphireg_{
-        //FIXME unused?
-        {{{5, 4, 4, 4, 4, 4, 4, 3, 4, 4, 5, 4}},    //inner
-         {{5, 4, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4}},    //outer
-         {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4}}}};  //outermost (triplets only)
-
     std::array<std::array<unsigned int, N_SEED>, 3> nphiregcm_{
         {{{5, 4, 4, 4, 4, 4, 4, 3, 4, 4, 5, 4}},    //inner
          {{5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4}},    //outer
@@ -878,19 +865,10 @@ namespace trklet {
 
     //IR should be set to 108 to match the FW for the summer chain, but ultimately should be at 156
     std::unordered_map<std::string, unsigned int> maxstep_{
-        {"IR", 108},  //IR will run at a higher clock speed to handle
+        {"IR", 156},  //IR will run at a higher clock speed to handle
                       //input links running at 25 Gbits/s
         //Set to 108 to match firmware project 240 MHz clock
-
-        {"VMR", 107},
-        {"TE", 107},
-        {"TC", 108},
-        {"PR", 108},
-        {"ME", 108},
-        //NOTE: The MC is set to 108, but `mergedepth`
-        //removes 3 iterations to emulate the delay
-        //due to the HLS priority encoder
-        {"MC", 108},
+        {"VMR", 108},
         {"TB", 108},
         {"MP", 108},
         {"TP", 108},
@@ -948,9 +926,9 @@ namespace trklet {
     bool warnNoDer_{false};  //If true will print out warnings about missing track fit derivatives
 
     //--- These used to create files needed by HLS code.
-    bool writeMem_{true};     //If true will print out content of memories (between algo steps) to files
-    bool writeTable_{true};   //If true will print out content of LUTs to files
-    bool writeConfig_{true};  //If true will print out the autogenerated configuration as files
+    bool writeMem_{false};     //If true will print out content of memories (between algo steps) to files
+    bool writeTable_{false};   //If true will print out content of LUTs to files
+    bool writeConfig_{false};  //If true will print out the autogenerated configuration as files
     std::string memPath_{"../data/MemPrints/"};  //path for writing memories
     std::string tablePath_{"../data/LUTs/"};     //path for writing LUTs
 

diff --git a/L1Trigger/TrackFindingTracklet/python/l1tTTTracksFromTrackletEmulation_cfi.py b/L1Trigger/TrackFindingTracklet/python/l1tTTTracksFromTrackletEmulation_cfi.py
@@ -28,7 +28,7 @@
                                                Fakefit = cms.bool(False), # True causes Tracklet reco to output TTTracks before DR & KF
                                                StoreTrackBuilderOutput = cms.bool(False), # if True EDProducts for TrackBuilder tracks and stubs will be filled
                                                RemovalType = cms.string("merge"), # Duplicate track removal
-                                               DoMultipleMatches = cms.bool(False) # Allow tracklet tracks multiple stubs per layer
+                                               DoMultipleMatches = cms.bool(True) # Allow tracklet tracks multiple stubs per layer
     )
 
 l1tTTTracksFromExtendedTrackletEmulation = l1tTTTracksFromTrackletEmulation.clone(

diff --git a/L1Trigger/TrackFindingTracklet/src/VMRouterCM.cc b/L1Trigger/TrackFindingTracklet/src/VMRouterCM.cc
@@ -186,7 +186,7 @@ void VMRouterCM::execute(unsigned int) {
   //Loop over the input stubs
   for (auto& stubinput : stubinputs_) {
     for (unsigned int i = 0; i < stubinput->nStubs(); i++) {
-      if (allStubCounter > settings_.maxStep("VMR"))
+      if (allStubCounter >= settings_.maxStep("VMR"))
         continue;
       if (allStubCounter >= (1 << N_BITSMEMADDRESS))
         continue;

diff --git a/L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker_cfg.py b/L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker_cfg.py
@@ -60,7 +60,7 @@
 # input and output
 ############################################################
 
-process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(5))
+process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(100))
 
 #--- To use MCsamples scripts, defining functions get*data*() for easy MC access,
 #--- follow instructions in https://github.com/cms-L1TK/MCsamples