DTC_merge2 branch updated to 1130

L1Trigger/TrackFindingTracklet/interface/MatchEngineUnit.h

@@ -48,7 +48,7 @@ namespace trklet {
 
     void reset();
 
-    void step();
+    void step(bool print);
 
   private:
     VMStubsMEMemory* vmstubsmemory_;

L1Trigger/TrackFindingTracklet/interface/Settings.h

@@ -50,21 +50,13 @@ namespace trklet {
     ~Settings() = default;
 
     // processing & memory modules, wiring, etc.
-    std::string DTCLinkFile() const { return DTCLinkFile_; }
-    std::string const& moduleCablingFile() const { return moduleCablingFile_; }
-    std::string const& DTCLinkLayerDiskFile() const { return DTCLinkLayerDiskFile_; }
     std::string const& fitPatternFile() const { return fitPatternFile_; }
     std::string const& processingModulesFile() const { return processingModulesFile_; }
     std::string const& memoryModulesFile() const { return memoryModulesFile_; }
     std::string const& wiresFile() const { return wiresFile_; }
     std::string const& tableTEDFile() const { return tableTEDFile_; }
     std::string const& tableTREFile() const { return tableTREFile_; }
 
-    void setDTCLinkFile(std::string DTCLinkFileName) { DTCLinkFile_ = DTCLinkFileName; }
-    void setModuleCablingFile(std::string moduleCablingFileName) { moduleCablingFile_ = moduleCablingFileName; }
-    void setDTCLinkLayerDiskFile(std::string DTCLinkLayerDiskFileName) {
-      DTCLinkLayerDiskFile_ = DTCLinkLayerDiskFileName;
-    }
     void setFitPatternFile(std::string fitPatternFileName) { fitPatternFile_ = fitPatternFileName; }
     void setProcessingModulesFile(std::string processingModulesFileName) {
       processingModulesFile_ = processingModulesFileName;
@@ -420,9 +412,6 @@ namespace trklet {
     }
 
   private:
-    std::string DTCLinkFile_;
-    std::string moduleCablingFile_;
-    std::string DTCLinkLayerDiskFile_;
     std::string fitPatternFile_;
     std::string processingModulesFile_;
     std::string memoryModulesFile_;
@@ -752,7 +741,7 @@ namespace trklet {
         {"TPars", false},        {"TPD", false},        {"TrackletPars", false},
         {"TED", false},          {"TP", false},         {"TRE", false},
         {"VMR", false},          {"StubsLayer", false}, {"StubsLayerSector", false},
-        {"HitEff", false},       {"MatchEff", false},   {"Cabling", false},
+        {"HitEff", false},       {"MatchEff", false},
         {"IFit", false},         {"AS", false}};
 
     std::array<double, N_DSS_MOD> rDSSinner_mod_{{68.9391, 78.7750, 85.4550, 96.3150, 102.3160}};

L1Trigger/TrackFindingTracklet/plugins/L1FPGATrackProducer.cc

@@ -81,7 +81,6 @@
 // Tracklet emulation
 #include "L1Trigger/TrackFindingTracklet/interface/Settings.h"
 #include "L1Trigger/TrackFindingTracklet/interface/Sector.h"
-#include "L1Trigger/TrackFindingTracklet/interface/Cabling.h"
 #include "L1Trigger/TrackFindingTracklet/interface/Track.h"
 #include "L1Trigger/TrackFindingTracklet/interface/TrackletEventProcessor.h"
 
@@ -151,10 +150,6 @@ class L1FPGATrackProducer : public edm::one::EDProducer<edm::one::WatchRuns> {
   edm::FileInPath processingModulesFile;
   edm::FileInPath wiresFile;
 
-  edm::FileInPath DTCLinkFile;
-  edm::FileInPath moduleCablingFile;
-  edm::FileInPath DTCLinkLayerDiskFile;
-
   edm::FileInPath tableTEDFile;
   edm::FileInPath tableTREFile;
 
@@ -228,10 +223,6 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
   memoryModulesFile = iConfig.getParameter<edm::FileInPath>("memoryModulesFile");
   wiresFile = iConfig.getParameter<edm::FileInPath>("wiresFile");
 
-  DTCLinkFile = iConfig.getParameter<edm::FileInPath>("DTCLinkFile");
-  moduleCablingFile = iConfig.getParameter<edm::FileInPath>("moduleCablingFile");
-  DTCLinkLayerDiskFile = iConfig.getParameter<edm::FileInPath>("DTCLinkLayerDiskFile");
-
   extended_ = iConfig.getParameter<bool>("Extended");
   nHelixPar_ = iConfig.getParameter<unsigned int>("Hnpar");
 
@@ -250,9 +241,6 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
   settings.setExtended(extended_);
   settings.setNHelixPar(nHelixPar_);
 
-  settings.setDTCLinkFile(DTCLinkFile.fullPath());
-  settings.setModuleCablingFile(moduleCablingFile.fullPath());
-  settings.setDTCLinkLayerDiskFile(DTCLinkLayerDiskFile.fullPath());
   settings.setFitPatternFile(fitPatternFile.fullPath());
   settings.setProcessingModulesFile(processingModulesFile.fullPath());
   settings.setMemoryModulesFile(memoryModulesFile.fullPath());
@@ -274,10 +262,7 @@ L1FPGATrackProducer::L1FPGATrackProducer(edm::ParameterSet const& iConfig)
   }
 
   if (settings.debugTracklet()) {
-    edm::LogVerbatim("Tracklet") << "cabling DTC links :     " << DTCLinkFile.fullPath()
-                                 << "\n module cabling :     " << moduleCablingFile.fullPath()
-                                 << "\n DTC link layer disk :     " << DTCLinkLayerDiskFile.fullPath()
-                                 << "\n fit pattern :     " << fitPatternFile.fullPath()
+    edm::LogVerbatim("Tracklet") << "fit pattern :     " << fitPatternFile.fullPath()
                                  << "\n process modules : " << processingModulesFile.fullPath()
                                  << "\n memory modules :  " << memoryModulesFile.fullPath()
                                  << "\n wires          :  " << wiresFile.fullPath();

L1Trigger/TrackFindingTracklet/python/Tracklet_cfi.py

@@ -17,9 +17,6 @@
                                                memoryModulesFile  = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/memorymodules_hourglass.dat'),
                                                processingModulesFile  = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/processingmodules_hourglass.dat'),
                                                wiresFile  = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/wires_hourglass.dat'),
-                                               DTCLinkFile  = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/calcNumDTCLinks.txt'),
-                                               DTCLinkLayerDiskFile = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/dtclinklayerdisk.dat'),
-                                               moduleCablingFile  = cms.FileInPath('L1Trigger/TrackFindingTracklet/data/modules_T5v3_27SP_nonant_tracklet.dat'),
                                                # Quality Flag and Quality params
                                                TrackQuality =cms.bool(True),
                                                TrackQualityPSet = cms.PSet(TrackQualityParams)

L1Trigger/TrackFindingTracklet/src/MatchEngineUnit.cc

@@ -53,7 +53,7 @@ void MatchEngineUnit::init(VMStubsMEMemory* vmstubsmemory,
   proj_ = proj;
 }
 
-void MatchEngineUnit::step() {
+void MatchEngineUnit::step(bool print) {
   if (idle() || candmatches_.almostfull())
     return;
 
@@ -106,6 +106,10 @@ void MatchEngineUnit::step() {
     }
   }
 
+  if (print) cout <<"MEU TrkId stubindex : "<<128*proj_->TCIndex()+proj_->trackletIndex()<<" "<<vmstub.stubindex().value()
+		  <<"   "<<((pass && dphicut) && table_[index])<<" index="<<index<<" projrinv bend : "<<projrinv_<<" "<<vmstub.bend().value()
+		  <<"  shift_ isPSseed_ :"<<shift_<<" "<<isPSseed_<<" slot="<<slot<<endl;
+
   //Check if stub bend and proj rinv consistent
   if ((pass && dphicut) && table_[index]) {
     std::pair<Tracklet*, const Stub*> tmp(proj_, vmstub.stub());

L1Trigger/TrackFindingTracklet/src/MatchProcessor.cc

@@ -256,12 +256,12 @@ void MatchProcessor::execute(unsigned int iSector, double phimin) {
 
             FPGAWord fpgaphi = proj->proj(layerdisk_).fpgaphiproj();
 
-	    if (print) cout << "PROJECTION "<<projMem->getName()<<": "<<proj->proj(layerdisk_).fpgaphiproj().value()
-			    << " " << proj->proj(layerdisk_).fpgarzproj().value()
-			    << " " << proj->proj(layerdisk_).fpgaphiprojder().value()
-			    << " " << proj->proj(layerdisk_).fpgarzprojder().value()
-			    << "TC index trackletIndex : "<<proj->TCIndex()<<" "<<proj->trackletIndex()
-			    <<endl;
+	    //if (print) cout << "PROJECTION "<<projMem->getName()<<": "<<proj->proj(layerdisk_).fpgaphiproj().value()
+	    //			    << " " << proj->proj(layerdisk_).fpgarzproj().value()
+	    //		    << " " << proj->proj(layerdisk_).fpgaphiprojder().value()
+	    //		    << " " << proj->proj(layerdisk_).fpgarzprojder().value()
+	    //		    << "TC index trackletIndex : "<<proj->TCIndex()<<" "<<proj->trackletIndex()
+	    //		    <<endl;
 
             unsigned int iphi = (fpgaphi.value() >> (fpgaphi.nbits() - nvmbits_)) & (nvmbins_ - 1);
 
@@ -270,6 +270,8 @@ void MatchProcessor::execute(unsigned int iSector, double phimin) {
 
             unsigned int extrabits = fpgaphi.bits(fpgaphi.nbits() - overlapbits, nextrabits);
 
+	    if (print) cout << "iphi extrabits: "<<iphi<<" "<<extrabits<<endl;
+
             unsigned int ivmPlus = iphi;
 
 	    int shift = 0;
@@ -284,9 +286,11 @@ void MatchProcessor::execute(unsigned int iSector, double phimin) {
               ivmMinus--;
             }
 
+
             int projrinv = -1;
             if (barrel_) {
-              projrinv = (1 << (nrinv_ - 1)) + (proj->fpgarinv().value() >> (proj->fpgarinv().nbits() - nrinv_));
+	      FPGAWord phider = proj->proj(layerdisk_).fpgaphiprojder();
+	      projrinv = (1 << (nrinv_ - 1)) - 1 - (phider.value() >> (phider.nbits() - nrinv_));
             } else {
               //The next lines looks up the predicted bend based on:
               // 1 - r projections
@@ -314,6 +318,10 @@ void MatchProcessor::execute(unsigned int iSector, double phimin) {
             unsigned int slot = proj->proj(layerdisk_).fpgarzbin1projvm().value();
             bool second = proj->proj(layerdisk_).fpgarzbin2projvm().value();
 
+	    if (print) cout << "istep="<<istep<<" TrkId stubindex : "<<128*proj->TCIndex()+proj->trackletIndex()
+			    <<" ivmMinus ivmPlus shift "<<ivmMinus<<" "<<ivmPlus<<" "<<shift
+			    <<"second: "<<second<<" iphiproj="<<fpgaphi.value()<<endl;
+
             unsigned int projfinephi = (fpgaphi.value() >> (fpgaphi.nbits() - (nvmbits_ + 3))) & 7;
             int projfinerz = proj->proj(layerdisk_).fpgafinerzvm().value();
 
@@ -356,7 +364,7 @@ void MatchProcessor::execute(unsigned int iSector, double phimin) {
     for (unsigned int iME = 0; iME < nMatchEngines_; iME++) {
       if (!matchengines_[iME].idle())
         countme++;
-      matchengines_[iME].step();
+      matchengines_[iME].step(print);
       //if match engine empty and we have queued projections add to match engine
       if ((!addedProjection) && matchengines_[iME].idle() && (!inputProjBuffer_.empty())) {
         ProjectionTemp tmpProj = inputProjBuffer_.read();
@@ -370,7 +378,7 @@ void MatchProcessor::execute(unsigned int iSector, double phimin) {
         if (layerdisk_ >= 6)
           nbins = 16;
 
-	if (print) cout << "istep = "<<istep<<" Initialize matchengine : "<<iME<<endl;
+	//if (print) cout << "istep = "<<istep<<" Initialize matchengine : "<<iME<<endl;
         matchengines_[iME].init(stubmem,
 				nbins,
 				tmpProj.slot(),
@@ -420,7 +428,7 @@ void MatchProcessor::execute(unsigned int iSector, double phimin) {
       }
       oldTracklet = tracklet;
 
-      if (print) cout << "istep = "<<istep<<" Call matchCalculator on iME:"<<iMEbest<<endl;
+      //if (print) cout << "istep = "<<istep<<" Call matchCalculator on iME:"<<iMEbest<<endl;
       bool match = matchCalculator(tracklet, fpgastub, print, istep);
 
       if (settings_.debugTracklet() && match) {
@@ -449,7 +457,7 @@ void MatchProcessor::execute(unsigned int iSector, double phimin) {
 bool MatchProcessor::matchCalculator(Tracklet* tracklet, const Stub* fpgastub, bool print, unsigned int istep) {
   const L1TStub* stub = fpgastub->l1tstub();
 
-  if (print) cout << "matchCalculator tcid trackletindex stubindex : "<<tracklet->TCIndex()<<" "<<tracklet->trackletIndex()<<" "<<fpgastub->allStubIndex().value()<<endl;
+  if (print) cout << "MatchCalculator istep="<<istep<<" TrkId stubindex : "<<128*tracklet->TCIndex()+tracklet->trackletIndex()<<" "<<fpgastub->allStubIndex().value()<<endl;
 
   if (layerdisk_ < N_LAYER) {
     const Projection& proj = tracklet->proj(layerdisk_);
@@ -465,7 +473,7 @@ bool MatchProcessor::matchCalculator(Tracklet* tracklet, const Stub* fpgastub, b
     int ideltaz = fpgastub->z().value() - iz;
     int ideltaphi = (fpgastub->phi().value() - iphi) << phishift_;
 
-    if (print) cout << "ideltaphi : " << fpgastub->phi().value()<<" "<<iphi<<" "<<icorr<<endl;
+    //if (print) cout << "ideltaphi : " << fpgastub->phi().value()<<" "<<iphi<<" "<<icorr<<endl;
 
     //Floating point calculations
 

L1Trigger/TrackFindingTracklet/src/TrackletEventProcessor.cc

@@ -98,18 +98,18 @@ void TrackletEventProcessor::init(Settings const& theSettings) {
     //Write configurations to file.
     if (settings_->writeConfig()) {
       std::ofstream wires = openfile(settings_->tablePath(), "wires.dat", __FILE__, __LINE__);
-      std::ofstream memories = openfile(settings_->tablePath(), "memories.dat", __FILE__, __LINE__);
-      std::ofstream modules = openfile(settings_->tablePath(), "modules.dat", __FILE__, __LINE__);
+      std::ofstream memorymodules = openfile(settings_->tablePath(), "memorymodules.dat", __FILE__, __LINE__);
+      std::ofstream processingmodules = openfile(settings_->tablePath(), "processingmodules.dat", __FILE__, __LINE__);
 
-      config.writeAll(wires, memories, modules);
+      config.writeAll(wires, memorymodules, processingmodules);
     }
 
     std::stringstream wires;
-    std::stringstream memories;
-    std::stringstream modules;
+    std::stringstream memorymodules;
+    std::stringstream processingmodules;
 
-    config.writeAll(wires, memories, modules);
-    configure(wires, memories, modules);
+    config.writeAll(wires, memorymodules, processingmodules);
+    configure(wires, memorymodules, processingmodules);
   }
 }
 

L1Trigger/TrackFindingTracklet/src/VMRouterTable.cc

@@ -143,11 +143,11 @@ void VMRouterTable::init(unsigned int layerdisk, std::string const& name) {
       if (layerdisk == 1 || layerdisk == 2 || layerdisk == 3 || layerdisk == 5) {
         std::string fnamesuffix = "L" + to_string(layerdisk + 1);
         writeVMTable(settings_.tablePath(), "VMTableOuter" + fnamesuffix + ".tab", vmrtable_);
-        // write disk teouter tables (D1, D2, D4)
-        if (layerdisk == 6 || layerdisk == 7 || layerdisk == 9) {
-          std::string fnamesuffix = "D" + to_string(layerdisk - N_LAYER + 1);
-          writeVMTable(settings_.tablePath(), "VMTableOuter" + fnamesuffix + ".tab", vmrtabletedisk_);
-        }
+      }
+      // write disk teouter tables (D1, D2, D4)
+      if (layerdisk == 6 || layerdisk == 7 || layerdisk == 9) {
+	std::string fnamesuffix = "D" + to_string(layerdisk - N_LAYER + 1);
+	writeVMTable(settings_.tablePath(), "VMTableOuter" + fnamesuffix + ".tab", vmrtabletedisk_);
       }
     } else {
       std::string fname = "VMRME_";

L1Trigger/TrackFindingTracklet/test/fpga.cc

@@ -54,9 +54,6 @@ int main(const int argc, const char **argv) {
   // ---------------------------------------------------------
   // these are options that are read from python configuration files for the CMSSW running, set manually for the standalone version
 
-  settings.setDTCLinkFile("../data/calcNumDTCLinks.txt");
-  settings.setModuleCablingFile("../data/modules_T5v3_27SP_nonant_tracklet.dat");
-  settings.setDTCLinkLayerDiskFile("../data/dtclinklayerdisk.dat");
   settings.setFitPatternFile("../data/fitpattern.txt");
   settings.setProcessingModulesFile("../data/processingmodules_" + settings.geomext() + ".dat");
   settings.setMemoryModulesFile("../data/memorymodules_" + settings.geomext() + ".dat");
@@ -67,10 +64,6 @@ int main(const int argc, const char **argv) {
     settings.setTableTREFile("../data/table_TRE/table_TRE_Dummy.txt");
   }
 
-  edm::LogVerbatim("Tracklet") << "cabling DTC links :     " << settings.DTCLinkFile();
-  edm::LogVerbatim("Tracklet") << "module cabling :     " << settings.moduleCablingFile();
-  edm::LogVerbatim("Tracklet") << "DTC link layer disk :     " << settings.DTCLinkLayerDiskFile();
-
   edm::LogVerbatim("Tracklet") << "fit pattern :     " << settings.fitPatternFile();
   edm::LogVerbatim("Tracklet") << "process modules : " << settings.processingModulesFile();
   edm::LogVerbatim("Tracklet") << "memory modules :  " << settings.memoryModulesFile();