From: Jan Michel Date: Wed, 10 Jun 2020 08:44:06 +0000 (+0200) Subject: update TDC config files X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=403a1a2853fcdd7ea0c28725364986bbff62e371;p=trb3sc.git update TDC config files --- diff --git a/tdctemplate/config_48_crate_4conn.vhd b/tdctemplate/config_48_crate_4conn.vhd index 6e586d5..c0230f1 100644 --- a/tdctemplate/config_48_crate_4conn.vhd +++ b/tdctemplate/config_48_crate_4conn.vhd @@ -21,7 +21,7 @@ package config is --TDC settings constant NUM_TDC_MODULES : integer range 1 to 4 := 1; -- number of tdc modules to implement - constant NUM_TDC_CHANNELS : integer range 1 to 65 := 49; -- number of tdc channels per module + constant NUM_TDC_CHANNELS : integer range 1 to 65 := 53; -- number of tdc channels per module constant NUM_TDC_CHANNELS_POWER2 : integer range 0 to 6 := 6; --the nearest power of two, for convenience reasons constant DOUBLE_EDGE_TYPE : integer range 0 to 3 := 3; --double edge type: 0, 1, 2, 3 -- 0: single edge only, diff --git a/tdctemplate/config_48_sfp_4conn.vhd b/tdctemplate/config_48_sfp_4conn.vhd index e6f8afb..0537139 100644 --- a/tdctemplate/config_48_sfp_4conn.vhd +++ b/tdctemplate/config_48_sfp_4conn.vhd @@ -16,12 +16,14 @@ package config is -- 0: 32 Pin AddOn -- 1: 4conn AddOn -- 2: 2x KEL on board - + -- 3: ADA AddOn (plus test on KEL) + -- 4: every fourth channel on ADA + constant PINOUT : integer := 1; --TDC settings constant NUM_TDC_MODULES : integer range 1 to 4 := 1; -- number of tdc modules to implement - constant NUM_TDC_CHANNELS : integer range 1 to 65 := 49; -- number of tdc channels per module + constant NUM_TDC_CHANNELS : integer range 1 to 65 := 57; -- number of tdc channels per module constant NUM_TDC_CHANNELS_POWER2 : integer range 0 to 6 := 5; --the nearest power of two, for convenience reasons constant DOUBLE_EDGE_TYPE : integer range 0 to 3 := 3; --double edge type: 0, 1, 2, 3 -- 0: single edge only, @@ -33,11 +35,12 @@ package config is constant TDC_DATA_FORMAT : integer := 0; constant EVENT_BUFFER_SIZE : integer range 9 to 13 := 13; -- size of the event buffer, 2**N - constant EVENT_MAX_SIZE : integer := 4095; --maximum event size. Should not exceed EVENT_BUFFER_SIZE/2 + constant EVENT_MAX_SIZE : integer := 1000; --maximum event size. Should not exceed EVENT_BUFFER_SIZE/4 --Runs with 120 MHz instead of 100 MHz constant USE_120_MHZ : integer := c_NO; constant USE_200MHZOSCILLATOR : integer := c_YES; + constant USE_CALIBRATION_200MHZ : integer := c_NO; constant USE_EXTERNAL_CLOCK : integer := c_YES; --'no' not implemented. constant CLOCK_FAST_SELECT : integer := c_NO; --fast clock select (135us) or slow (280ms)? @@ -62,6 +65,9 @@ package config is constant TRIG_GEN_INPUT_NUM : integer := 48; constant TRIG_GEN_OUTPUT_NUM : integer := 4; constant MONITOR_INPUT_NUM : integer := 52; + + --trigger generation only on 'fast' channels from Padiwa + constant TRIG_GEN_FAST_CHANNELS : integer := c_NO; ------------------------------------------------------------------------------ --End of design configuration diff --git a/tdctemplate/config_compile_frankfurt.pl b/tdctemplate/config_compile_frankfurt.pl index a12dc1d..0faf42b 100644 --- a/tdctemplate/config_compile_frankfurt.pl +++ b/tdctemplate/config_compile_frankfurt.pl @@ -1,14 +1,14 @@ TOPNAME => "trb3sc_tdctemplate", lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de"; lm_license_file_for_par => "1702\@hadeb05.gsi.de", -lattice_path => '/d/jspc29/lattice/diamond/3.10_x64', -synplify_path => '/d/jspc29/lattice/synplify/O-2018.09-SP1/', +lattice_path => '/d/jspc29/lattice/diamond/3.11_x64', +synplify_path => '/d/jspc29/lattice/synplify/P-2019.09-SP1/', nodelist_file => '../tdctemplate/nodes_tdctemplate.txt', #Include only necessary lpf file #pinout_file => 'trb3sc_32pin', #name of pin-out file, if not equal TOPNAME -#pinout_file => 'trb3sc_padiwa', #name of pin-out file, if not equal TOPNAME -pinout_file => 'trb3sc_ada', #name of pin-out file, if not equal TOPNAME +pinout_file => 'trb3sc_padiwa', #name of pin-out file, if not equal TOPNAME +#pinout_file => 'trb3sc_ada', #name of pin-out file, if not equal TOPNAME include_TDC => 1, include_GBE => 0,