From 51212512f44b6fb04dfb98ad48f360f1757e393f Mon Sep 17 00:00:00 2001 From: Andreas Neiser Date: Sat, 13 Jun 2015 18:05:36 +0200 Subject: [PATCH] CTS: More technical updates/changes --- cts/compile_central_gsi.pl | 4 ++-- cts/config_mainz_a2.vhd | 23 ++++++++++++----------- cts/nodelist.txt | 4 ++++ cts/tdc_release | 2 +- cts/trb3_central.p2t | 16 ++++++++-------- 5 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 cts/nodelist.txt diff --git a/cts/compile_central_gsi.pl b/cts/compile_central_gsi.pl index 065d0a8..7dce132 100755 --- a/cts/compile_central_gsi.pl +++ b/cts/compile_central_gsi.pl @@ -16,8 +16,8 @@ my $CbmNetPath = "../../cbmnet"; my $lm_license_file_for_synplify = "27000\@lxcad01.gsi.de"; my $lm_license_file_for_par = "1702\@hadeb05.gsi.de"; -my $lattice_path = '/opt/lattice/diamond/3.2_x64/'; -my $synplify_path = '/opt/synplicity/I-2013.09-SP1/'; +my $lattice_path = '/opt/lattice/diamond/3.4_x64/'; +my $synplify_path = '/opt/synplicity/J-2014.09-SP2/'; my $lattice_bin_path = "$lattice_path/bin/lin64"; # note the lin or lin64 at the end, no isfgpa needed my $config_vhd = 'config_mainz_a2.vhd'; ################################################################################### diff --git a/cts/config_mainz_a2.vhd b/cts/config_mainz_a2.vhd index b5728a5..cc1bf78 100644 --- a/cts/config_mainz_a2.vhd +++ b/cts/config_mainz_a2.vhd @@ -12,15 +12,19 @@ package config is constant INCLUDE_CBMNET : integer range c_NO to c_YES := c_NO; --include TDC for all four trigger input lines - constant INCLUDE_TDC : integer range c_NO to c_YES := c_YES; - constant TDC_CHANNEL_NUMBER : integer := 5; ---Use 64 word ringbuffer instead of 128 word ringbuffer in TDC channels - constant USE_64_FIFO : integer := c_YES; - ---Define ringbuffer size for TDC channels: 32-64-128 - constant RING_BUFFER_SIZE : integer range 0 to 128 := 1; - + constant INCLUDE_TDC : integer range c_NO to c_YES := c_YES; + constant TDC_CHANNEL_NUMBER : integer := 5; + constant DOUBLE_EDGE_TYPE : integer range 0 to 3 := 0; --double edge type: 0, 1, 2, 3 + -- 0: single edge only, + -- 1: same channel, + -- 2: alternating channels, + -- 3: same channel with stretcher + constant RING_BUFFER_SIZE : integer range 0 to 7 := 7; --ring buffer size: 0, 1, 2, 3, 7 + --ring buffer size: 32,64,96,128,dyn +-- Include SFP power readout + constant INCLUDE_SFP_DDM : integer range c_NO to c_YES := c_YES; + --use all four SFP (1-4) as downlink to other boards (only w/o CBMNET) constant USE_4_SFP : integer range c_NO to c_YES := c_NO; @@ -28,9 +32,6 @@ package config is --Run wih 125 MHz instead of 100 MHz constant USE_125_MHZ : integer range c_NO to c_YES := c_NO; ---Run external 200 MHz clock source - constant USE_EXTERNAL_CLOCK : integer range c_NO to c_YES := c_NO; - --Which external trigger module (ETM) to use? constant INCLUDE_ETM : integer range c_NO to c_YES := c_YES; type ETM_CHOICE_type is (ETM_CHOICE_MBS_VULOM, ETM_CHOICE_MAINZ_A2, ETM_CHOICE_CBMNET); diff --git a/cts/nodelist.txt b/cts/nodelist.txt new file mode 100644 index 0000000..69960b7 --- /dev/null +++ b/cts/nodelist.txt @@ -0,0 +1,4 @@ +[lxhadeb07] +system = linux +corenum = 24 +workdir = /home/aneiser/trb3/ADC/workdir diff --git a/cts/tdc_release b/cts/tdc_release index b10de14..776b998 120000 --- a/cts/tdc_release +++ b/cts/tdc_release @@ -1 +1 @@ -../../tdc/releases/tdc_v2.1.2 \ No newline at end of file +../../tdc/releases/tdc_v2.1.3 \ No newline at end of file diff --git a/cts/trb3_central.p2t b/cts/trb3_central.p2t index 123a34b..7ea44f9 100644 --- a/cts/trb3_central.p2t +++ b/cts/trb3_central.p2t @@ -1,21 +1,21 @@ -w --i 15 +-i 20 -l 5 --n 1 +-n 100 -y --s 15 --t 18 +#-s 1 +-t 1 -c 1 --e 2 +-e 3 #-g guidefile.ncd -#-m nodelist.txt +-m ../nodelist.txt # -w # -i 6 # -l 5 # -n 1 # -t 1 -# -s 1 +# -s 1 # -c 0 # -e 0 # --exp parCDP=1:parCDR=1:parPlcInLimit=0:parPlcInNeighborSize=1:parPathBased=ON:parHold=ON:parHoldLimit=10000:paruseNBR=1 +-exp parCB=On:parCDP=1:parCDR=1:parPlcInLimit=0:parPlcInNeighborSize=1:parPathBased=ON:parHold=ON:parHoldLimit=10000:parUseNBR=1 -- 2.43.0