From ce6f6fecbce2ee4420adfceab35a81b92f3d5061 Mon Sep 17 00:00:00 2001 From: Anders Ryd Date: Sun, 9 Jun 2024 14:29:52 -0400 Subject: [PATCH] Various fixes to allow the InputRouter test to run --- TestBenches/InputRouter_test.cpp | 2 +- TrackletAlgorithm/InputRouter.h | 12 ++++++------ emData/download.sh | 1 + project/script_IR.tcl | 8 ++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/TestBenches/InputRouter_test.cpp b/TestBenches/InputRouter_test.cpp index 660ea7e75b6..d8d7e4bd01d 100644 --- 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 index 837942ba402..5c79e071584 100644 --- 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 index c012a0e4427..449e30bb2a7 100755 --- 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 index 21588c36b5d..150ebb97a56 100644 --- 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]