Various fixes to allow the InputRouter test to run

cms-L1TK · Jun 9, 2024 · ce6f6fe · ce6f6fe
1 parent 81a6d70
commit ce6f6fe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/TestBenches/InputRouter_test.cpp b/TestBenches/InputRouter_test.cpp
@@ -553,7 +553,7 @@ int main(int argc, char * argv[])
 
   // allow for truncation memory check [i.e. missing entries can pass check]
   bool cTruncation=false;
-  std::string cInputFile_Wires = "LUTsCM/wires.dat";
+  std::string cInputFile_Wires = "LUTsSplit/wires.dat";
 
   auto cMap = getMap( cInputFile_Wires ); 
   // for( uint8_t cLinkIndx=0; cLinkIndx < 20; cLinkIndx++)

diff --git a/TrackletAlgorithm/InputRouter.h b/TrackletAlgorithm/InputRouter.h
@@ -31,22 +31,22 @@ static const int kNMEMwidth = 5;
 // LUT with phi corrections to the nominal radius. Only used by layers.
 // Values are determined by the radius and the bend of the stub.
 const int kPhiCorrtable_L1[] =
-#include "../emData/LUTsCM/VMPhiCorrL1.tab"
+#include "../emData/LUTsSplit/VMPhiCorrL1.tab"
 ;
 const int kPhiCorrtable_L2[] =
-#include "../emData/LUTsCM/VMPhiCorrL2.tab"
+#include "../emData/LUTsSplit/VMPhiCorrL2.tab"
 ;
 const int kPhiCorrtable_L3[] =
-#include "../emData/LUTsCM/VMPhiCorrL3.tab"
+#include "../emData/LUTsSplit/VMPhiCorrL3.tab"
 ;
 const int kPhiCorrtable_L4[] =
-#include "../emData/LUTsCM/VMPhiCorrL4.tab"
+#include "../emData/LUTsSplit/VMPhiCorrL4.tab"
 ;
 const int kPhiCorrtable_L5[] =
-#include "../emData/LUTsCM/VMPhiCorrL5.tab"
+#include "../emData/LUTsSplit/VMPhiCorrL5.tab"
 ;
 const int kPhiCorrtable_L6[] =
-#include "../emData/LUTsCM/VMPhiCorrL6.tab"
+#include "../emData/LUTsSplit/VMPhiCorrL6.tab"
 ;
 
 

diff --git a/emData/download.sh b/emData/download.sh
@@ -130,6 +130,7 @@ mkdir -p ../TopFunctions/CombinedBarrelConfig
 ./generate_TB.py       -w LUTsCMBarrel/wires.dat -o ../TopFunctions/CombinedBarrelConfig
 ### combined barrel config                      
 mkdir -p ../TopFunctions/CombinedConfig_FPGA2
+./generate_IR.py       -w LUTsSplit/wires.dat -o ../TopFunctions/CombinedConfig_FPGA2
 ./generate_VMRCM.py -a -w LUTsSplit/wires.dat -o ../TopFunctions/CombinedConfig_FPGA2
 ./generate_TP.py       -w LUTsSplit/wires.dat -l LUTsSplit -o ../TopFunctions/CombinedConfig_FPGA2
 ./generate_PC.py       -sp -w  LUTsSplit/wires.dat -o ../TopFunctions/CombinedConfig_FPGA2

diff --git a/project/script_IR.tcl b/project/script_IR.tcl
@@ -68,13 +68,13 @@ set module_to_export InputRouterTop_IR_DTC_PS10G_3_A
 open_project -reset inputrouter
 
 # source files
-set CFLAGS {-std=c++11 -I../TrackletAlgorithm  -I../TrackletAlgorithm/TestBench -I../TopFunctions/CombinedConfig}
-add_files ../TopFunctions/CombinedConfig/InputRouterTop.cc -cflags "$CFLAGS"
+set CFLAGS {-std=c++11 -I../TrackletAlgorithm  -I../TrackletAlgorithm/TestBench -I../TopFunctions/CombinedConfig_FPGA2}
+add_files ../TopFunctions/CombinedConfig_FPGA2/InputRouterTop.cc -cflags "$CFLAGS"
 add_files -tb ../TestBenches/InputRouter_test.cpp -cflags "$CFLAGS"
 
 # data files
-add_files -tb ../emData/MemPrintsCM/InputStubs/
-add_files -tb ../emData/LUTsCM/
+add_files -tb ../emData/MemPrintsSplit/InputStubs/
+add_files -tb ../emData/LUTsSplit/
 
 set nProc [exec nproc]