From: Cahit Date: Wed, 24 Apr 2013 13:18:07 +0000 (+0200) Subject: intermediate commit - cu X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=20daacfc023a968ecbec3c65894be41287ef57a7;p=trb3.git intermediate commit - cu --- diff --git a/base/trb3_components.vhd b/base/trb3_components.vhd index 97c63da..5484c46 100644 --- a/base/trb3_components.vhd +++ b/base/trb3_components.vhd @@ -44,6 +44,14 @@ package trb3_components is ); end component; + component pll_in125_out20 is + port ( + CLK : in std_logic; + CLKOP : out std_logic; -- 20 MHz + CLKOK : out std_logic; -- 125 MHz, bypass + LOCK : out std_logic); + end component pll_in125_out20; + component TDC is generic ( CHANNEL_NUMBER : integer range 2 to 65; @@ -54,6 +62,7 @@ package trb3_components is CLK_READOUT : in std_logic; REFERENCE_TIME : in std_logic; HIT_IN : in std_logic_vector(CHANNEL_NUMBER-1 downto 1); + HIT_CALIBRATION : in std_logic; TRG_WIN_PRE : in std_logic_vector(10 downto 0); TRG_WIN_POST : in std_logic_vector(10 downto 0); TRG_DATA_VALID_IN : in std_logic := '0'; diff --git a/tdc_releases/tdc_v1.5/Readout.vhd b/tdc_releases/tdc_v1.5/Readout.vhd index 1a94436..5ea340f 100644 --- a/tdc_releases/tdc_v1.5/Readout.vhd +++ b/tdc_releases/tdc_v1.5/Readout.vhd @@ -5,7 +5,7 @@ -- File : Readout.vhd -- Author : cugur@gsi.de -- Created : 2012-10-25 --- Last update: 2013-04-17 +-- Last update: 2013-04-24 ------------------------------------------------------------------------------- -- Description: ------------------------------------------------------------------------------- @@ -400,6 +400,11 @@ begin -- behavioral if TRG_TYPE_IN = x"E" then wr_header_fsm <= '1'; RD_NEXT <= SEND_STATUS; + elsif TRG_TYPE_IN = x"D" then + RD_NEXT <= WAIT_FOR_TRG_WIND_END; --WR_HEADER_A; + start_trg_win_cnt_fsm <= '1'; + wr_header_fsm <= '1'; + readout_fsm <= '1'; else data_finished_fsm <= '1'; RD_NEXT <= SEND_TRG_RELEASE_A; diff --git a/tdc_releases/tdc_v1.5/TDC.vhd b/tdc_releases/tdc_v1.5/TDC.vhd index 8238344..b6295af 100644 --- a/tdc_releases/tdc_v1.5/TDC.vhd +++ b/tdc_releases/tdc_v1.5/TDC.vhd @@ -19,6 +19,7 @@ entity TDC is CLK_READOUT : in std_logic; REFERENCE_TIME : in std_logic; HIT_IN : in std_logic_vector(CHANNEL_NUMBER-1 downto 1); + HIT_CALIBRATION : in std_logic; TRG_WIN_PRE : in std_logic_vector(10 downto 0); TRG_WIN_POST : in std_logic_vector(10 downto 0); -- @@ -102,6 +103,7 @@ architecture TDC of TDC is signal trigger_win_en_i : std_logic; signal ch_en_i : std_logic_vector(64 downto 1); signal data_limit_i : unsigned(7 downto 0); + signal calibration_on : std_logic; -- turns on calibration for trig type 0xC -- Logic analyser signal logic_anal_data_i : std_logic_vector(3*32-1 downto 0); -- Hit signals @@ -160,13 +162,13 @@ begin -- Channel and calibration enable signals GEN_Channel_Enable : for i in 1 to CHANNEL_NUMBER-1 generate - process (ch_en_i, calibration_on, random, HIT_IN) + process (ch_en_i, calibration_on, HIT_CALIBRATION, HIT_IN) begin if ch_en_i(i) = '1' then if calibration_on = '1' then - hit_in_i(i) <= random; + hit_in_i(i) <= HIT_CALIBRATION; else - hit_in_i(i) <= HIT_IN(i) + hit_in_i(i) <= HIT_IN(i); end if; else hit_in_i(i) <= '0'; @@ -178,7 +180,7 @@ begin CalibrationSwitch : process (CLK_READOUT) begin if rising_edge(CLK_READOUT) then - if TRG_TYPE_IN = x"C" then + if TRG_TYPE_IN = x"D" then calibration_on <= '1'; else calibration_on <= '0'; diff --git a/tdc_releases/tdc_v1.5/tdc_constraints.lpf b/tdc_releases/tdc_v1.5/tdc_constraints.lpf index 98242bb..88b8ce1 100644 --- a/tdc_releases/tdc_v1.5/tdc_constraints.lpf +++ b/tdc_releases/tdc_v1.5/tdc_constraints.lpf @@ -27,643 +27,643 @@ LOCATE UGROUP "Ref_ff_en" SITE "R8C156D" ; ## DELAY LINE and HIT BUFFER PLACEMENTS ## ############################################################################## UGROUP "FC_1" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.1.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_1_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_1" SITE "R10C131D" ; UGROUP "hit_1" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.1.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_1_Channels/hit_buf_RNO; LOCATE UGROUP "hit_1" SITE "R11C133D" ; UGROUP "ff_en_1" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.1.Channels/Channel_200_1/ff_array_en_i_RNO; + BLKNAME THE_TDC/GEN_Channels_1_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_1" SITE "R10C156D" ; # UGROUP "FC_2" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.2.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_2_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_2" SITE "R21C131D" ; UGROUP "hit_2" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.2.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_2_Channels/hit_buf_RNO; LOCATE UGROUP "hit_2" SITE "R22C133D" ; UGROUP "ff_en_2" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.2.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_2_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_2" SITE "R21C156D" ; # UGROUP "FC_3" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.3.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_3_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_3" SITE "R23C131D" ; UGROUP "hit_3" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.3.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_3_Channels/hit_buf_RNO; LOCATE UGROUP "hit_3" SITE "R24C133D" ; UGROUP "ff_en_3" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.3.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_3_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_3" SITE "R23C156D" ; # UGROUP "FC_4" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.4.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_4_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_4" SITE "R30C131D" ; UGROUP "hit_4" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.4.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_4_Channels/hit_buf_RNO; LOCATE UGROUP "hit_4" SITE "R31C133D" ; UGROUP "ff_en_4" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.4.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_4_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_4" SITE "R30C156D" ; # UGROUP "FC_5" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.5.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_5_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_5" SITE "R32C131D" ; UGROUP "hit_5" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.5.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_5_Channels/hit_buf_RNO; LOCATE UGROUP "hit_5" SITE "R33C133D" ; UGROUP "ff_en_5" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.5.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_5_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_5" SITE "R32C156D" ; # UGROUP "FC_6" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.6.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_6_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_6" SITE "R35C131D" ; UGROUP "hit_6" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.6.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_6_Channels/hit_buf_RNO; LOCATE UGROUP "hit_6" SITE "R36C133D" ; UGROUP "ff_en_6" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.6.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_6_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_6" SITE "R35C156D" ; # UGROUP "FC_7" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.7.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_7_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_7" SITE "R37C131D" ; UGROUP "hit_7" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.7.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_7_Channels/hit_buf_RNO; LOCATE UGROUP "hit_7" SITE "R38C133D" ; UGROUP "ff_en_7" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.7.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_7_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_7" SITE "R37C156D" ; # UGROUP "FC_8" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.8.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_8_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_8" SITE "R48C131D" ; UGROUP "hit_8" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.8.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_8_Channels/hit_buf_RNO; LOCATE UGROUP "hit_8" SITE "R49C133D" ; UGROUP "ff_en_8" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.8.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_8_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_8" SITE "R48C156D" ; # UGROUP "FC_9" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.9.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_9_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_9" SITE "R50C131D" ; UGROUP "hit_9" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.9.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_9_Channels/hit_buf_RNO; LOCATE UGROUP "hit_9" SITE "R51C133D" ; UGROUP "ff_en_9" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.9.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_9_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_9" SITE "R50C156D" ; # UGROUP "FC_10" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.10.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_10_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_10" SITE "R53C131D" ; UGROUP "hit_10" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.10.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_10_Channels/hit_buf_RNO; LOCATE UGROUP "hit_10" SITE "R54C133D" ; UGROUP "ff_en_10" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.10.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_10_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_10" SITE "R53C156D" ; # UGROUP "FC_11" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.11.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_11_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_11" SITE "R55C131D" ; UGROUP "hit_11" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.11.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_11_Channels/hit_buf_RNO; LOCATE UGROUP "hit_11" SITE "R56C133D" ; UGROUP "ff_en_11" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.11.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_11_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_11" SITE "R55C156D" ; # UGROUP "FC_12" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.12.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_12_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_12" SITE "R10C58D" ; UGROUP "hit_12" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.12.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_12_Channels/hit_buf_RNO; LOCATE UGROUP "hit_12" SITE "R11C60D" ; UGROUP "ff_en_12" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.12.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_12_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_12" SITE "R10C83D" ; # UGROUP "FC_13" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.13.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_13_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_13" SITE "R23C58D" ; UGROUP "hit_13" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.13.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_13_Channels/hit_buf_RNO; LOCATE UGROUP "hit_13" SITE "R24C60D" ; UGROUP "ff_en_13" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.13.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_13_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_13" SITE "R23C83D" ; # UGROUP "FC_14" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.14.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_14_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_14" SITE "R32C58D" ; UGROUP "hit_14" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.14.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_14_Channels/hit_buf_RNO; LOCATE UGROUP "hit_14" SITE "R33C60D" ; UGROUP "ff_en_14" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.14.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_14_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_14" SITE "R32C83D" ; # UGROUP "FC_15" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.15.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_15_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_15" SITE "R37C58D" ; UGROUP "hit_15" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.15.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_15_Channels/hit_buf_RNO; LOCATE UGROUP "hit_15" SITE "R38C60D" ; UGROUP "ff_en_15" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.15.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_15_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_15" SITE "R37C83D" ; # UGROUP "FC_16" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.16.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_16_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_16" SITE "R50C58D" ; UGROUP "hit_16" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.16.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_16_Channels/hit_buf_RNO; LOCATE UGROUP "hit_16" SITE "R51C60D" ; UGROUP "ff_en_16" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.16.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_16_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_16" SITE "R50C83D" ; # UGROUP "FC_17" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.17.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_17_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_17" SITE "R66C131D" ; UGROUP "hit_17" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.17.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_17_Channels/hit_buf_RNO; LOCATE UGROUP "hit_17" SITE "R67C133D" ; UGROUP "ff_en_17" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.17.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_17_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_17" SITE "R66C156D" ; # UGROUP "FC_18" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.18.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_18_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_18" SITE "R68C131D" ; UGROUP "hit_18" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.18.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_18_Channels/hit_buf_RNO; LOCATE UGROUP "hit_18" SITE "R69C133D" ; UGROUP "ff_en_18" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.18.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_18_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_18" SITE "R68C156D" ; # UGROUP "FC_19" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.19.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_19_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_19" SITE "R71C131D" ; UGROUP "hit_19" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.19.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_19_Channels/hit_buf_RNO; LOCATE UGROUP "hit_19" SITE "R72C133D" ; UGROUP "ff_en_19" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.19.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_19_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_19" SITE "R71C156D" ; # UGROUP "FC_20" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.20.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_20_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_20" SITE "R73C131D" ; UGROUP "hit_20" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.20.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_20_Channels/hit_buf_RNO; LOCATE UGROUP "hit_20" SITE "R74C133D" ; UGROUP "ff_en_20" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.20.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_20_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_20" SITE "R73C156D" ; # UGROUP "FC_21" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.21.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_21_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_21" SITE "R84C131D" ; UGROUP "hit_21" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.21.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_21_Channels/hit_buf_RNO; LOCATE UGROUP "hit_21" SITE "R85C133D" ; UGROUP "ff_en_21" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.21.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_21_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_21" SITE "R84C156D" ; # UGROUP "FC_22" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.22.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_22_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_22" SITE "R86C131D" ; UGROUP "hit_22" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.22.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_22_Channels/hit_buf_RNO; LOCATE UGROUP "hit_22" SITE "R87C133D" ; UGROUP "ff_en_22" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.22.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_22_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_22" SITE "R86C156D" ; # UGROUP "FC_23" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.23.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_23_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_23" SITE "R89C131D" ; UGROUP "hit_23" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.23.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_23_Channels/hit_buf_RNO; LOCATE UGROUP "hit_23" SITE "R90C133D" ; UGROUP "ff_en_23" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.23.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_23_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_23" SITE "R89C156D" ; # UGROUP "FC_24" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.24.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_24_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_24" SITE "R91C131D" ; UGROUP "hit_24" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.24.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_24_Channels/hit_buf_RNO; LOCATE UGROUP "hit_24" SITE "R92C133D" ; UGROUP "ff_en_24" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.24.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_24_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_24" SITE "R91C156D" ; # UGROUP "FC_25" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.25.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_25_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_25" SITE "R102C131D" ; UGROUP "hit_25" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.25.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_25_Channels/hit_buf_RNO; LOCATE UGROUP "hit_25" SITE "R103C133D" ; UGROUP "ff_en_25" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.25.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_25_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_25" SITE "R102C156D" ; # UGROUP "FC_26" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.26.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_26_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_26" SITE "R104C131D" ; UGROUP "hit_26" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.26.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_26_Channels/hit_buf_RNO; LOCATE UGROUP "hit_26" SITE "R105C133D" ; UGROUP "ff_en_26" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.26.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_26_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_26" SITE "R104C156D" ; # UGROUP "FC_27" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.27.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_27_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_27" SITE "R111C131D" ; UGROUP "hit_27" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.27.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_27_Channels/hit_buf_RNO; LOCATE UGROUP "hit_27" SITE "R112C133D" ; UGROUP "ff_en_27" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.27.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_27_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_27" SITE "R111C156D" ; # UGROUP "FC_28" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.28.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_28_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_28" SITE "R113C131D" ; UGROUP "hit_28" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.28.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_28_Channels/hit_buf_RNO; LOCATE UGROUP "hit_28" SITE "R114C133D" ; UGROUP "ff_en_28" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.28.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_28_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_28" SITE "R113C156D" ; # UGROUP "FC_29" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.29.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_29_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_29" SITE "R91C58D" ; UGROUP "hit_29" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.29.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_29_Channels/hit_buf_RNO; LOCATE UGROUP "hit_29" SITE "R92C60D" ; UGROUP "ff_en_29" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.29.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_29_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_29" SITE "R91C83D" ; # UGROUP "FC_30" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.30.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_30_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_30" SITE "R104C58D" ; UGROUP "hit_30" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.30.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_30_Channels/hit_buf_RNO; LOCATE UGROUP "hit_30" SITE "R105C60D" ; UGROUP "ff_en_30" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.30.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_30_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_30" SITE "R104C83D" ; # UGROUP "FC_31" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.31.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_31_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_31" SITE "R113C58D" ; UGROUP "hit_31" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.31.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_31_Channels/hit_buf_RNO; LOCATE UGROUP "hit_31" SITE "R114C60D" ; UGROUP "ff_en_31" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.31.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_31_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_31" SITE "R113C83D" ; # UGROUP "FC_32" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.32.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_32_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_32" SITE "R84C58D" ; UGROUP "hit_32" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.32.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_32_Channels/hit_buf_RNO; LOCATE UGROUP "hit_32" SITE "R85C60D" ; UGROUP "ff_en_32" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.32.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_32_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_32" SITE "R84C83D" ; # UGROUP "FC_33" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.33.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_33_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_33" SITE "R8C58D" ; UGROUP "hit_33" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.33.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_33_Channels/hit_buf_RNO; LOCATE UGROUP "hit_33" SITE "R9C60D" ; UGROUP "ff_en_33" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.33.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_33_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_33" SITE "R8C83D" ; # UGROUP "FC_34" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.34.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_34_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_34" SITE "R21C58D" ; UGROUP "hit_34" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.34.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_34_Channels/hit_buf_RNO; LOCATE UGROUP "hit_34" SITE "R22C60D" ; UGROUP "ff_en_34" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.34.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_34_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_34" SITE "R21C83D" ; # UGROUP "FC_35" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.35.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_35_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_35" SITE "R30C58D" ; UGROUP "hit_35" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.35.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_35_Channels/hit_buf_RNO; LOCATE UGROUP "hit_35" SITE "R31C60D" ; UGROUP "ff_en_35" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.35.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_35_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_35" SITE "R30C83D" ; # UGROUP "FC_36" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.36.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_36_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_36" SITE "R35C58D" ; UGROUP "hit_36" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.36.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_36_Channels/hit_buf_RNO; LOCATE UGROUP "hit_36" SITE "R36C60D" ; UGROUP "ff_en_36" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.36.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_36_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_36" SITE "R35C83D" ; # UGROUP "FC_37" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.37.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_37_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_37" SITE "R48C58D" ; UGROUP "hit_37" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.37.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_37_Channels/hit_buf_RNO; LOCATE UGROUP "hit_37" SITE "R49C60D" ; UGROUP "ff_en_37" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.37.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_37_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_37" SITE "R48C83D" ; # UGROUP "FC_38" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.38.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_38_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_38" SITE "R8C2D" ; UGROUP "hit_38" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.38.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_38_Channels/hit_buf_RNO; LOCATE UGROUP "hit_38" SITE "R9C4D" ; UGROUP "ff_en_38" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.38.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_38_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_38" SITE "R8C27D" ; # UGROUP "FC_39" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.39.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_39_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_39" SITE "R10C2D" ; UGROUP "hit_39" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.39.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_39_Channels/hit_buf_RNO; LOCATE UGROUP "hit_39" SITE "R11C4D" ; UGROUP "ff_en_39" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.39.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_39_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_39" SITE "R10C27D" ; # UGROUP "FC_40" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.40.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_40_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_40" SITE "R21C2D" ; UGROUP "hit_40" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.40.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_40_Channels/hit_buf_RNO; LOCATE UGROUP "hit_40" SITE "R22C4D" ; UGROUP "ff_en_40" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.40.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_40_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_40" SITE "R21C27D" ; # UGROUP "FC_41" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.41.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_41_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_41" SITE "R23C2D" ; UGROUP "hit_41" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.41.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_41_Channels/hit_buf_RNO; LOCATE UGROUP "hit_41" SITE "R24C4D" ; UGROUP "ff_en_41" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.41.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_41_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_41" SITE "R23C27D" ; # UGROUP "FC_42" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.42.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_42_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_42" SITE "R30C2D" ; UGROUP "hit_42" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.42.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_42_Channels/hit_buf_RNO; LOCATE UGROUP "hit_42" SITE "R31C4D" ; UGROUP "ff_en_42" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.42.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_42_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_42" SITE "R30C27D" ; # UGROUP "FC_43" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.43.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_43_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_43" SITE "R32C2D" ; UGROUP "hit_43" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.43.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_43_Channels/hit_buf_RNO; LOCATE UGROUP "hit_43" SITE "R33C4D" ; UGROUP "ff_en_43" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.43.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_43_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_43" SITE "R32C27D" ; # UGROUP "FC_44" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.44.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_44_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_44" SITE "R35C2D" ; UGROUP "hit_44" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.44.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_44_Channels/hit_buf_RNO; LOCATE UGROUP "hit_44" SITE "R36C4D" ; UGROUP "ff_en_44" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.44.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_44_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_44" SITE "R35C27D" ; # UGROUP "FC_45" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.45.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_45_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_45" SITE "R37C2D" ; UGROUP "hit_45" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.45.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_45_Channels/hit_buf_RNO; LOCATE UGROUP "hit_45" SITE "R38C4D" ; UGROUP "ff_en_45" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.45.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_45_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_45" SITE "R37C27D" ; # UGROUP "FC_46" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.46.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_46_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_46" SITE "R48C2D" ; UGROUP "hit_46" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.46.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_46_Channels/hit_buf_RNO; LOCATE UGROUP "hit_46" SITE "R49C4D" ; UGROUP "ff_en_46" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.46.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_46_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_46" SITE "R48C27D" ; # UGROUP "FC_47" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.47.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_47_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_47" SITE "R50C2D" ; UGROUP "hit_47" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.47.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_47_Channels/hit_buf_RNO; LOCATE UGROUP "hit_47" SITE "R51C4D" ; UGROUP "ff_en_47" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.47.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_47_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_47" SITE "R50C27D" ; # UGROUP "FC_48" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.48.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_48_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_48" SITE "R53C2D" ; UGROUP "hit_48" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.48.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_48_Channels/hit_buf_RNO; LOCATE UGROUP "hit_48" SITE "R54C4D" ; UGROUP "ff_en_48" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.48.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_48_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_48" SITE "R53C27D" ; # UGROUP "FC_49" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.49.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_49_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_49" SITE "R55C2D" ; UGROUP "hit_49" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.49.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_49_Channels/hit_buf_RNO; LOCATE UGROUP "hit_49" SITE "R56C4D" ; UGROUP "ff_en_49" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.49.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_49_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_49" SITE "R55C27D" ; # UGROUP "FC_50" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.50.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_50_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_50" SITE "R89C58D" ; UGROUP "hit_50" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.50.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_50_Channels/hit_buf_RNO; LOCATE UGROUP "hit_50" SITE "R90C60D" ; UGROUP "ff_en_50" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.50.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_50_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_50" SITE "R89C83D" ; # UGROUP "FC_51" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.51.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_51_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_51" SITE "R102C58D" ; UGROUP "hit_51" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.51.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_51_Channels/hit_buf_RNO; LOCATE UGROUP "hit_51" SITE "R103C60D" ; UGROUP "ff_en_51" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.51.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_51_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_51" SITE "R102C83D" ; # UGROUP "FC_52" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.52.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_52_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_52" SITE "R111C58D" ; UGROUP "hit_52" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.52.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_52_Channels/hit_buf_RNO; LOCATE UGROUP "hit_52" SITE "R112C60D" ; UGROUP "ff_en_52" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.52.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_52_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_52" SITE "R111C83D" ; # UGROUP "FC_53" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.53.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_53_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_53" SITE "R66C2D" ; UGROUP "hit_53" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.53.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_53_Channels/hit_buf_RNO; LOCATE UGROUP "hit_53" SITE "R67C4D" ; UGROUP "ff_en_53" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.53.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_53_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_53" SITE "R66C27D" ; # UGROUP "FC_54" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.54.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_54_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_54" SITE "R68C2D" ; UGROUP "hit_54" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.54.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_54_Channels/hit_buf_RNO; LOCATE UGROUP "hit_54" SITE "R69C4D" ; UGROUP "ff_en_54" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.54.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_54_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_54" SITE "R68C27D" ; # UGROUP "FC_55" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.55.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_55_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_55" SITE "R71C2D" ; UGROUP "hit_55" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.55.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_55_Channels/hit_buf_RNO; LOCATE UGROUP "hit_55" SITE "R72C4D" ; UGROUP "ff_en_55" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.55.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_55_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_55" SITE "R71C27D" ; # UGROUP "FC_56" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.56.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_56_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_56" SITE "R73C2D" ; UGROUP "hit_56" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.56.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_56_Channels/hit_buf_RNO; LOCATE UGROUP "hit_56" SITE "R74C4D" ; UGROUP "ff_en_56" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.56.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_56_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_56" SITE "R73C27D" ; # UGROUP "FC_57" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.57.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_57_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_57" SITE "R84C2D" ; UGROUP "hit_57" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.57.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_57_Channels/hit_buf_RNO; LOCATE UGROUP "hit_57" SITE "R85C4D" ; UGROUP "ff_en_57" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.57.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_57_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_57" SITE "R84C27D" ; # UGROUP "FC_58" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.58.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_58_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_58" SITE "R86C2D" ; UGROUP "hit_58" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.58.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_58_Channels/hit_buf_RNO; LOCATE UGROUP "hit_58" SITE "R87C4D" ; UGROUP "ff_en_58" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.58.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_58_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_58" SITE "R86C27D" ; # UGROUP "FC_59" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.59.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_59_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_59" SITE "R89C2D" ; UGROUP "hit_59" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.59.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_59_Channels/hit_buf_RNO; LOCATE UGROUP "hit_59" SITE "R90C4D" ; UGROUP "ff_en_59" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.59.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_59_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_59" SITE "R89C27D" ; # UGROUP "FC_60" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.60.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_60_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_60" SITE "R91C2D" ; UGROUP "hit_60" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.60.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_60_Channels/hit_buf_RNO; LOCATE UGROUP "hit_60" SITE "R92C4D" ; UGROUP "ff_en_60" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.60.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_60_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_60" SITE "R91C27D" ; # UGROUP "FC_61" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.61.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_61_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_61" SITE "R102C2D" ; UGROUP "hit_61" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.61.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_61_Channels/hit_buf_RNO; LOCATE UGROUP "hit_61" SITE "R103C4D" ; UGROUP "ff_en_61" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.61.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_61_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_61" SITE "R102C27D" ; # UGROUP "FC_62" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.62.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_62_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_62" SITE "R104C2D" ; UGROUP "hit_62" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.62.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_62_Channels/hit_buf_RNO; LOCATE UGROUP "hit_62" SITE "R105C4D" ; UGROUP "ff_en_62" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.62.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_62_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_62" SITE "R104C27D" ; # UGROUP "FC_63" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.63.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_63_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_63" SITE "R111C2D" ; UGROUP "hit_63" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.63.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_63_Channels/hit_buf_RNO; LOCATE UGROUP "hit_63" SITE "R112C4D" ; UGROUP "ff_en_63" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.63.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_63_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_63" SITE "R111C27D" ; # UGROUP "FC_64" BBOX 1 51 - BLKNAME THE_TDC/GEN_Channels.64.Channels/Channel_200_1/FC; + BLKNAME THE_TDC/GEN_Channels_64_Channels/Channel_200_1/FC; LOCATE UGROUP "FC_64" SITE "R113C2D" ; UGROUP "hit_64" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.64.Channels/hit_buf_RNO; + BLKNAME THE_TDC/GEN_Channels_64_Channels/hit_buf_RNO; LOCATE UGROUP "hit_64" SITE "R114C4D" ; UGROUP "ff_en_64" BBOX 1 1 - BLKNAME THE_TDC/GEN_Channels.64.Channels/Channel_200_1/ff_array_en_i_1_i; + BLKNAME THE_TDC/GEN_Channels_64_Channels/Channel_200_1/ff_array_en_i_RNO; LOCATE UGROUP "ff_en_64" SITE "R113C27D" ; @@ -674,212 +674,212 @@ UGROUP "E&F_ref" BBOX 6 25 BLKNAME THE_TDC/The_Reference_Time/Reference_Channel_200_1; LOCATE UGROUP "E&F_ref" SITE "R11C131D" ; UGROUP "E&F_1" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.1.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_1_Channels/Channel_200_1; LOCATE UGROUP "E&F_1" SITE "R11C156D" ; UGROUP "E&F_2" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.2.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_2_Channels/Channel_200_1; LOCATE UGROUP "E&F_2" SITE "R15C131D" ; UGROUP "E&F_3" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.3.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_3_Channels/Channel_200_1; LOCATE UGROUP "E&F_3" SITE "R15C156D" ; UGROUP "E&F_4" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.4.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_4_Channels/Channel_200_1; LOCATE UGROUP "E&F_4" SITE "R24C131D" ; UGROUP "E&F_5" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.5.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_5_Channels/Channel_200_1; LOCATE UGROUP "E&F_5" SITE "R24C156D" ; UGROUP "E&F_6" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.6.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_6_Channels/Channel_200_1; LOCATE UGROUP "E&F_6" SITE "R38C131D" ; UGROUP "E&F_7" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.7.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_7_Channels/Channel_200_1; LOCATE UGROUP "E&F_7" SITE "R38C156D" ; UGROUP "E&F_8" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.8.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_8_Channels/Channel_200_1; LOCATE UGROUP "E&F_8" SITE "R42C131D" ; UGROUP "E&F_9" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.9.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_9_Channels/Channel_200_1; LOCATE UGROUP "E&F_9" SITE "R42C156D" ; UGROUP "E&F_10" BBOX 6 24 - BLKNAME THE_TDC/GEN_Channels.10.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_10_Channels/Channel_200_1; LOCATE UGROUP "E&F_10" SITE "R56C131D" ; UGROUP "E&F_11" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.11.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_11_Channels/Channel_200_1; LOCATE UGROUP "E&F_11" SITE "R56C155D" ; UGROUP "E&F_12" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.12.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_12_Channels/Channel_200_1; LOCATE UGROUP "E&F_12" SITE "R11C84D" ; UGROUP "E&F_13" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.13.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_13_Channels/Channel_200_1; LOCATE UGROUP "E&F_13" SITE "R15C84D" ; UGROUP "E&F_14" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.14.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_14_Channels/Channel_200_1; LOCATE UGROUP "E&F_14" SITE "R24C84D" ; UGROUP "E&F_15" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.15.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_15_Channels/Channel_200_1; LOCATE UGROUP "E&F_15" SITE "R38C84D" ; UGROUP "E&F_16" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.16.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_16_Channels/Channel_200_1; LOCATE UGROUP "E&F_16" SITE "R42C84D" ; UGROUP "E&F_17" BBOX 6 24 - BLKNAME THE_TDC/GEN_Channels.17.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_17_Channels/Channel_200_1; LOCATE UGROUP "E&F_17" SITE "R60C131D" ; UGROUP "E&F_18" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.18.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_18_Channels/Channel_200_1; LOCATE UGROUP "E&F_18" SITE "R60C155D" ; UGROUP "E&F_19" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.19.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_19_Channels/Channel_200_1; LOCATE UGROUP "E&F_19" SITE "R74C131D" ; UGROUP "E&F_20" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.20.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_20_Channels/Channel_200_1; LOCATE UGROUP "E&F_20" SITE "R74C156D" ; UGROUP "E&F_21" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.21.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_21_Channels/Channel_200_1; LOCATE UGROUP "E&F_21" SITE "R78C131D" ; UGROUP "E&F_22" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.22.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_22_Channels/Channel_200_1; LOCATE UGROUP "E&F_22" SITE "R78C156D" ; UGROUP "E&F_23" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.23.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_23_Channels/Channel_200_1; LOCATE UGROUP "E&F_23" SITE "R92C131D" ; UGROUP "E&F_24" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.24.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_24_Channels/Channel_200_1; LOCATE UGROUP "E&F_24" SITE "R92C156D" ; UGROUP "E&F_25" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.25.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_25_Channels/Channel_200_1; LOCATE UGROUP "E&F_25" SITE "R96C131D" ; UGROUP "E&F_26" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.26.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_26_Channels/Channel_200_1; LOCATE UGROUP "E&F_26" SITE "R96C156D" ; UGROUP "E&F_27" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.27.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_27_Channels/Channel_200_1; LOCATE UGROUP "E&F_27" SITE "R105C131D" ; UGROUP "E&F_28" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.28.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_28_Channels/Channel_200_1; LOCATE UGROUP "E&F_28" SITE "R105C156D" ; UGROUP "E&F_29" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.29.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_29_Channels/Channel_200_1; LOCATE UGROUP "E&F_29" SITE "R92C84D" ; UGROUP "E&F_30" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.30.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_30_Channels/Channel_200_1; LOCATE UGROUP "E&F_30" SITE "R96C84D" ; UGROUP "E&F_31" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.31.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_31_Channels/Channel_200_1; LOCATE UGROUP "E&F_31" SITE "R105C84D" ; UGROUP "E&F_32" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.32.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_32_Channels/Channel_200_1; LOCATE UGROUP "E&F_32" SITE "R78C72D" ; UGROUP "E&F_33" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.33.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_33_Channels/Channel_200_1; LOCATE UGROUP "E&F_33" SITE "R11C59D" ; UGROUP "E&F_34" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.34.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_34_Channels/Channel_200_1; LOCATE UGROUP "E&F_34" SITE "R15C59D" ; UGROUP "E&F_35" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.35.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_35_Channels/Channel_200_1; LOCATE UGROUP "E&F_35" SITE "R24C59D" ; UGROUP "E&F_36" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.36.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_36_Channels/Channel_200_1; LOCATE UGROUP "E&F_36" SITE "R38C59D" ; UGROUP "E&F_37" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.37.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_37_Channels/Channel_200_1; LOCATE UGROUP "E&F_37" SITE "R42C59D" ; UGROUP "E&F_38" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.38.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_38_Channels/Channel_200_1; LOCATE UGROUP "E&F_38" SITE "R11C3D" ; UGROUP "E&F_39" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.39.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_39_Channels/Channel_200_1; LOCATE UGROUP "E&F_39" SITE "R11C28D" ; UGROUP "E&F_40" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.40.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_40_Channels/Channel_200_1; LOCATE UGROUP "E&F_40" SITE "R15C3D" ; UGROUP "E&F_41" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.41.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_41_Channels/Channel_200_1; LOCATE UGROUP "E&F_41" SITE "R15C28D" ; UGROUP "E&F_42" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.42.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_42_Channels/Channel_200_1; LOCATE UGROUP "E&F_42" SITE "R24C3D" ; UGROUP "E&F_43" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.43.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_43_Channels/Channel_200_1; LOCATE UGROUP "E&F_43" SITE "R24C28D" ; UGROUP "E&F_44" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.44.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_44_Channels/Channel_200_1; LOCATE UGROUP "E&F_44" SITE "R38C3D" ; UGROUP "E&F_45" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.45.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_45_Channels/Channel_200_1; LOCATE UGROUP "E&F_45" SITE "R38C28D" ; UGROUP "E&F_46" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.46.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_46_Channels/Channel_200_1; LOCATE UGROUP "E&F_46" SITE "R42C3D" ; UGROUP "E&F_47" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.47.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_47_Channels/Channel_200_1; LOCATE UGROUP "E&F_47" SITE "R42C28D" ; UGROUP "E&F_48" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.48.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_48_Channels/Channel_200_1; LOCATE UGROUP "E&F_48" SITE "R56C3D" ; UGROUP "E&F_49" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.49.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_49_Channels/Channel_200_1; LOCATE UGROUP "E&F_49" SITE "R56C28D" ; UGROUP "E&F_50" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.50.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_50_Channels/Channel_200_1; LOCATE UGROUP "E&F_50" SITE "R92C59D" ; UGROUP "E&F_51" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.51.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_51_Channels/Channel_200_1; LOCATE UGROUP "E&F_51" SITE "R96C59D" ; UGROUP "E&F_52" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.52.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_52_Channels/Channel_200_1; LOCATE UGROUP "E&F_52" SITE "R105C59D" ; UGROUP "E&F_53" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.53.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_53_Channels/Channel_200_1; LOCATE UGROUP "E&F_53" SITE "R60C3D" ; UGROUP "E&F_54" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.54.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_54_Channels/Channel_200_1; LOCATE UGROUP "E&F_54" SITE "R60C28D" ; UGROUP "E&F_55" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.55.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_55_Channels/Channel_200_1; LOCATE UGROUP "E&F_55" SITE "R74C3D" ; UGROUP "E&F_56" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.56.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_56_Channels/Channel_200_1; LOCATE UGROUP "E&F_56" SITE "R74C28D" ; UGROUP "E&F_57" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.57.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_57_Channels/Channel_200_1; LOCATE UGROUP "E&F_57" SITE "R78C3D" ; UGROUP "E&F_58" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.58.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_58_Channels/Channel_200_1; LOCATE UGROUP "E&F_58" SITE "R78C28D" ; UGROUP "E&F_59" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.59.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_59_Channels/Channel_200_1; LOCATE UGROUP "E&F_59" SITE "R92C3D" ; UGROUP "E&F_60" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.60.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_60_Channels/Channel_200_1; LOCATE UGROUP "E&F_60" SITE "R92C28D" ; UGROUP "E&F_61" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.61.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_61_Channels/Channel_200_1; LOCATE UGROUP "E&F_61" SITE "R96C3D" ; UGROUP "E&F_62" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.62.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_62_Channels/Channel_200_1; LOCATE UGROUP "E&F_62" SITE "R96C28D" ; UGROUP "E&F_63" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.63.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_63_Channels/Channel_200_1; LOCATE UGROUP "E&F_63" SITE "R105C3D" ; UGROUP "E&F_64" BBOX 6 25 - BLKNAME THE_TDC/GEN_Channels.64.Channels/Channel_200_1; + BLKNAME THE_TDC/GEN_Channels_64_Channels/Channel_200_1; LOCATE UGROUP "E&F_64" SITE "R105C28D" ; ############################################################################# ## Coarse counter register placement UGROUP "UR_Coarse_Counter" - BLKNAME THE_TDC/GenCoarseCounter.1.TheCoarseCounter; + BLKNAME THE_TDC/GenCoarseCounter_1_TheCoarseCounter; LOCATE UGROUP "UR_Coarse_Counter" SITE R36C134D; #REGION "REGION_UR_CC" ; UGROUP "LR_Coarse_Counter" - BLKNAME THE_TDC/GenCoarseCounter.2.TheCoarseCounter; + BLKNAME THE_TDC/GenCoarseCounter_2_TheCoarseCounter; LOCATE UGROUP "LR_Coarse_Counter" SITE R85C134D; #REGION "REGION_LR_CC" ; UGROUP "UL_Coarse_Counter" - BLKNAME THE_TDC/GenCoarseCounter.3.TheCoarseCounter; + BLKNAME THE_TDC/GenCoarseCounter_3_TheCoarseCounter; LOCATE UGROUP "UL_Coarse_Counter" SITE R36C50D; #REGION "REGION_UL_CC" ; UGROUP "LL_Coarse_Counter" - BLKNAME THE_TDC/GenCoarseCounter.4.TheCoarseCounter; + BLKNAME THE_TDC/GenCoarseCounter_4_TheCoarseCounter; LOCATE UGROUP "LL_Coarse_Counter" SITE R85C50D; #REGION "REGION_LL_CC" ; UGROUP "Epoch_Counter" BLKNAME THE_TDC/TheEpochCounter; @@ -905,21 +905,21 @@ UGROUP "BusHandlers" #BLOCK NET "THE_TDC/reset_tdc*" ; BLOCK NET "THE_TDC/hit_in_i_*" ; -#BLOCK PATH TO CELL "THE_TDC/GEN_Channels.*.Channels/Channel_200_1/FC/FF_*" ; +#BLOCK PATH TO CELL "THE_TDC/GEN_Channels_*_Channels/Channel_200_1/FC/FF_*" ; #BLOCK NET "THE_TDC/reset_counters_200*" ; -BLOCK PATH TO CELL "THE_TDC/GEN_Channels.*.Channels/sync_q_2[*]"; +BLOCK PATH TO CELL "THE_TDC/GEN_Channels_*_Channels/sync_q_2_*"; PROHIBIT SECONDARY NET "THE_TDC/The_Reference_Time/Reference_Channel_200_1/ff_array_en_i"; -PROHIBIT SECONDARY NET "THE_TDC/GEN_Channels.*.Channels/Channel_200_1/ff_array_en_i"; +PROHIBIT SECONDARY NET "THE_TDC/GEN_Channels_*_Channels/Channel_200_1/ff_array_en_i"; MAXDELAY NET "THE_TDC/The_Reference_Time/hit_buf" 0.600000 nS DATAPATH_ONLY ; -MAXDELAY NET "THE_TDC/GEN_Channels.*.Channels/hit_buf" 0.600000 nS DATAPATH_ONLY ; +MAXDELAY NET "THE_TDC/GEN_Channels_*_Channels/hit_buf" 0.600000 nS DATAPATH_ONLY ; -MULTICYCLE FROM CELL "THE_RESET_HANDLER/final_reset[1]" 50 ns; -MULTICYCLE FROM CELL "THE_TDC/TheEpochCounter/counter[*]" TO CELL "THE_TDC/GEN_Channels.*.Channels/Channel_200_1/epoch_cntr[*]" 5.000000 X; -MULTICYCLE FROM CELL "THE_TDC/TheEpochCounter/counter[*]" TO CELL "THE_TDC/The_Reference_Time/Reference_Channel_200_1/epoch_cntr[*]" 5.000000 X; +MULTICYCLE FROM CELL "THE_RESET_HANDLER/final_reset_1" 50 ns; +MULTICYCLE FROM CELL "THE_TDC/TheEpochCounter/counter_*" TO CELL "THE_TDC/GEN_Channels_*_Channels/Channel_200_1/epoch_cntr_*" 5.000000 X; +MULTICYCLE FROM CELL "THE_TDC/TheEpochCounter/counter_*" TO CELL "THE_TDC/The_Reference_Time/Reference_Channel_200_1/epoch_cntr_*" 5.000000 X; #MULTICYCLE FROM CELL "THE_TDC/The_Reference_Time/Reference_Channel_200_1/FIFO_ALMOST_FULL_OUT" TO CELL "THE_TDC/TheReadout/data_out_reg_*" 2.000000 X; MULTICYCLE FROM CELL "THE_TDC/The_Reference_Time/Reference_Channel_200_1/FIFO_FULL_OUT" TO CELL "THE_TDC/TheReadout/data_out_reg_*" 2.000000 X; -MULTICYCLE FROM CELL "THE_TDC/GEN_Channels.*.Channels/Channel_200_1/FIFO_FULL_OUT" TO CELL "THE_TDC/TheReadout/data_out_reg*" 2.000000 X; -#MULTICYCLE FROM CELL "THE_TDC/GEN_Channels.*.Channels/Channel_200_1/FIFO_ALMOST_FULL_OUT" TO CELL "THE_TDC/TheReadout/data_out_reg*" 2.000000 X; +MULTICYCLE FROM CELL "THE_TDC/GEN_Channels_*_Channels/Channel_200_1/FIFO_FULL_OUT" TO CELL "THE_TDC/TheReadout/data_out_reg*" 2.000000 X; +#MULTICYCLE FROM CELL "THE_TDC/GEN_Channels_*_Channels/Channel_200_1/FIFO_ALMOST_FULL_OUT" TO CELL "THE_TDC/TheReadout/data_out_reg*" 2.000000 X; diff --git a/tdc_releases/tdc_v1.5/trb3_periph.vhd b/tdc_releases/tdc_v1.5/trb3_periph.vhd index 806c419..d4baaaa 100644 --- a/tdc_releases/tdc_v1.5/trb3_periph.vhd +++ b/tdc_releases/tdc_v1.5/trb3_periph.vhd @@ -93,6 +93,8 @@ architecture trb3_periph_arch of trb3_periph is --Clock / Reset signal clk_100_i : std_logic; --clock for main logic, 100 MHz, via Clock Manager and internal PLL signal clk_200_i : std_logic; --clock for logic at 200 MHz, via Clock Manager and bypassed PLL + signal clk_125_i : std_logic; -- 125 MHz, via Clock Manager and bypassed PLL + signal clk_20_i : std_logic; -- clock for calibrating the tdc, 20 MHz, via Clock Manager and internal PLL signal pll_lock : std_logic; --Internal PLL locked. E.g. used to reset all internal logic. signal clear_i : std_logic; signal reset_i : std_logic; @@ -280,6 +282,13 @@ begin LOCK => pll_lock ); + -- generates hits for calibration uncorrelated with tdc clk + THE_CALIBRATION_PLL : pll_in125_out20 + port map ( + CLK => CLK_GPLL_LEFT, + CLKOP => clk_20_i, + CLKOK => clk_125_i, + LOCK => open); --------------------------------------------------------------------------- -- The TrbNet media interface (to other FPGA) @@ -719,6 +728,7 @@ begin CLK_READOUT => clk_100_i, -- Clock for the readout REFERENCE_TIME => timing_trg_received_i, -- Reference time input HIT_IN => hit_in_i(4 downto 1), -- Channel start signals + HIT_CALIBRATION => clk_20_i, -- Hits for calibrating the TDC TRG_WIN_PRE => tdc_ctrl_reg(42 downto 32), -- Pre-Trigger window width TRG_WIN_POST => tdc_ctrl_reg(58 downto 48), -- Post-Trigger window width -- diff --git a/tdc_releases/tdc_v1.5/trbnet_constraints.lpf b/tdc_releases/tdc_v1.5/trbnet_constraints.lpf index 3d0a7a7..38622c4 100644 --- a/tdc_releases/tdc_v1.5/trbnet_constraints.lpf +++ b/tdc_releases/tdc_v1.5/trbnet_constraints.lpf @@ -28,19 +28,19 @@ REGION "REGION_TRBNET" "R35C109D" 70 22 DEVSIZE; # BLKNAME THE_ENDPOINT/THE_ENDPOINT #LOCATE UGROUP "TrbNet" REGION "REGION_TRBNET"; LOCATE UGROUP "THE_BUS_HANDLER/Bus_handler_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.0.geniobuf.IOBUF/genINITOBUF2.gen_INITOBUF3.INITOBUF/OBUF_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.1.geniobuf.IOBUF/genINITOBUF2.gen_INITOBUF3.INITOBUF/OBUF_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.2.gentermbuf.termbuf/TRMBUF_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.3.geniobuf.IOBUF/genINITOBUF2.gen_INITOBUF3.INITOBUF/OBUF_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_0_geniobuf_IOBUF/genINITOBUF2_gen_INITOBUF3_INITOBUF/OBUF_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_1_geniobuf_IOBUF/genINITOBUF2_gen_INITOBUF3_INITOBUF/OBUF_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_2_gentermbuf_termbuf/TRMBUF_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_IOBUF/genINITOBUF2_gen_INITOBUF3_INITOBUF/OBUF_group" REGION "REGION_TRBNET"; LOCATE UGROUP "THE_ENDPOINT/THE_INTERNAL_BUS_HANDLER/Bus_handler_group" REGION "REGION_TRBNET"; LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/MPLEX/MUX_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.3.geniobuf.gen_regio.regIO/the_addresses/HUBLOGIC_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.3.geniobuf.gen_regio.regIO/RegIO_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.3.geniobuf.gen_api.DAT_PASSIVE_API/API_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.1.geniobuf.gen_api.DAT_PASSIVE_API/API_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.3.geniobuf.IOBUF/genREPLYOBUF1.REPLYOBUF/OBUF_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.3.geniobuf.IOBUF/GEN_IBUF.THE_IBUF/IBUF_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.1.geniobuf.IOBUF/genREPLYOBUF1.REPLYOBUF/OBUF_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.1.geniobuf.IOBUF/GEN_IBUF.THE_IBUF/IBUF_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.0.geniobuf.IOBUF/genREPLYOBUF1.REPLYOBUF/OBUF_group" REGION "REGION_TRBNET"; -LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers.0.geniobuf.IOBUF/GEN_IBUF.THE_IBUF/IBUF_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_gen_regio_regIO/the_addresses/HUBLOGIC_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_gen_regio_regIO/RegIO_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_gen_api_DAT_PASSIVE_API/API_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_1_geniobuf_gen_api_DAT_PASSIVE_API/API_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_IOBUF/genREPLYOBUF1_REPLYOBUF/OBUF_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_3_geniobuf_IOBUF/GEN_IBUF_THE_IBUF/IBUF_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_1_geniobuf_IOBUF/genREPLYOBUF1_REPLYOBUF/OBUF_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_1_geniobuf_IOBUF/GEN_IBUF_THE_IBUF/IBUF_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_0_geniobuf_IOBUF/genREPLYOBUF1_REPLYOBUF/OBUF_group" REGION "REGION_TRBNET"; +LOCATE UGROUP "THE_ENDPOINT/THE_ENDPOINT/genbuffers_0_geniobuf_IOBUF/GEN_IBUF_THE_IBUF/IBUF_group" REGION "REGION_TRBNET"; diff --git a/tdc_test/compile_constraints.pl b/tdc_test/compile_constraints.pl index a34a22a..491a12f 100755 --- a/tdc_test/compile_constraints.pl +++ b/tdc_test/compile_constraints.pl @@ -8,6 +8,6 @@ my $TOPNAME = "trb3_periph"; #Name of top-level entity #create full lpf file system("cp ../base/trb3_periph_mainz.lpf diamond/$TOPNAME.lpf"); -system("cat ../tdc_releases/tdc_v1.4/trbnet_constraints.lpf >> diamond/$TOPNAME.lpf"); -system("cat ../tdc_releases/tdc_v1.4/tdc_constraints.lpf >> diamond/$TOPNAME.lpf"); +system("cat ../tdc_releases/tdc_v1.5/trbnet_constraints.lpf >> diamond/$TOPNAME.lpf"); +system("cat ../tdc_releases/tdc_v1.5/tdc_constraints.lpf >> diamond/$TOPNAME.lpf"); diff --git a/wasa/compile_constraints.pl b/wasa/compile_constraints.pl index 1e5965e..5f06cb9 100755 --- a/wasa/compile_constraints.pl +++ b/wasa/compile_constraints.pl @@ -1,5 +1,4 @@ #!/usr/bin/perl - use Data::Dumper; use warnings; use strict; @@ -7,6 +6,6 @@ use strict; my $TOPNAME = "trb3_periph_padiwa"; #Name of top-level entity #create full lpf file -system("cp ../base/$TOPNAME.lpf workdir/$TOPNAME.lpf"); -system("cat ../tdc_releases/tdc_v1.3/trbnet_constraints.lpf >> workdir/$TOPNAME.lpf"); -system("cat ../tdc_releases/tdc_v1.3/tdc_constraints.lpf >> workdir/$TOPNAME.lpf"); +system("cp ../base/$TOPNAME.lpf diamond/$TOPNAME.lpf"); +system("cat ../tdc_releases/tdc_v1.5/trbnet_constraints.lpf >> diamond/$TOPNAME.lpf"); +system("cat ../tdc_releases/tdc_v1.5/tdc_constraints.lpf >> diamond/$TOPNAME.lpf"); diff --git a/wasa/trb3_periph_padiwa.vhd b/wasa/trb3_periph_padiwa.vhd index 9de4ea2..ea5649d 100644 --- a/wasa/trb3_periph_padiwa.vhd +++ b/wasa/trb3_periph_padiwa.vhd @@ -100,6 +100,8 @@ architecture trb3_periph_padiwa_arch of trb3_periph_padiwa is --Clock / Reset signal clk_100_i : std_logic; --clock for main logic, 100 MHz, via Clock Manager and internal PLL signal clk_200_i : std_logic; --clock for logic at 200 MHz, via Clock Manager and bypassed PLL + signal clk_125_i : std_logic; -- 125 MHz, via Clock Manager and bypassed PLL + signal clk_20_i : std_logic; -- clock for calibrating the tdc, 20 MHz, via Clock Manager and internal PLL signal pll_lock : std_logic; --Internal PLL locked. E.g. used to reset all internal logic. signal clear_i : std_logic; signal reset_i : std_logic; @@ -246,7 +248,7 @@ architecture trb3_periph_padiwa_arch of trb3_periph_padiwa is signal tdc_ctrl_read : std_logic; signal last_tdc_ctrl_read : std_logic; signal tdc_ctrl_write : std_logic; - signal tdc_ctrl_addr : std_logic_vector(1 downto 0); + signal tdc_ctrl_addr : std_logic_vector(2 downto 0); signal tdc_ctrl_data_in : std_logic_vector(31 downto 0); signal tdc_ctrl_data_out : std_logic_vector(31 downto 0); signal tdc_ctrl_reg : std_logic_vector(5*32-1 downto 0); @@ -308,6 +310,14 @@ begin LOCK => pll_lock ); + -- generates hits for calibration uncorrelated with tdc clk + THE_CALIBRATION_PLL : pll_in125_out20 + port map ( + CLK => CLK_GPLL_LEFT, + CLKOP => clk_20_i, + CLKOK => clk_125_i, + LOCK => open); + gen_sync_clocks : if SYNC_MODE = c_YES generate clk_100_i <= rx_clock_100; clk_200_i <= rx_clock_200; @@ -511,7 +521,7 @@ begin generic map( PORT_NUMBER => 9, PORT_ADDRESSES => (0 => x"d000", 1 => x"d100", 2 => x"d400", 3 => x"c000", 4 => x"c100", 5 => x"c200", 6 => x"c300", 7 => x"b000", 8 => x"c800", others => x"0000"), - PORT_ADDR_MASK => (0 => 1, 1 => 6, 2 => 5, 3 => 7, 4 => 5, 5 => 7, 6 => 7, 7 => 9, 8 => 2, others => 0) + PORT_ADDR_MASK => (0 => 1, 1 => 6, 2 => 5, 3 => 7, 4 => 5, 5 => 7, 6 => 7, 7 => 9, 8 => 3, others => 0) ) port map( CLK => clk_100_i, @@ -631,8 +641,8 @@ begin BUS_READ_ENABLE_OUT(8) => tdc_ctrl_read, BUS_WRITE_ENABLE_OUT(8) => tdc_ctrl_write, BUS_DATA_OUT(8*32+31 downto 8*32) => tdc_ctrl_data_in, - BUS_ADDR_OUT(8*16+1 downto 8*16) => tdc_ctrl_addr, - BUS_ADDR_OUT(8*16+15 downto 8*16+2) => open, + BUS_ADDR_OUT(8*16+2 downto 8*16) => tdc_ctrl_addr, + BUS_ADDR_OUT(8*16+15 downto 8*16+3) => open, BUS_TIMEOUT_OUT(8) => open, BUS_DATA_IN(8*32+31 downto 8*32) => tdc_ctrl_data_out, BUS_DATAREADY_IN(8) => last_tdc_ctrl_read, @@ -775,14 +785,15 @@ begin ------------------------------------------------------------------------------- THE_TDC : TDC generic map ( - CHANNEL_NUMBER => 65, -- Number of TDC channels + CHANNEL_NUMBER => 5, -- Number of TDC channels CONTROL_REG_NR => 5) port map ( RESET => reset_i, CLK_TDC => clk_tdc, -- Clock used for the time measurement CLK_READOUT => clk_100_i, -- Clock for the readout REFERENCE_TIME => timing_trg_received_i, -- Reference time input - HIT_IN => hit_in_i(64 downto 1), -- Channel start signals + HIT_IN => hit_in_i(4 downto 1), -- Channel start signals + HIT_CALIBRATION => clk_20_i, -- Hits for calibrating the TDC TRG_WIN_PRE => tdc_ctrl_reg(42 downto 32), -- Pre-Trigger window width TRG_WIN_POST => tdc_ctrl_reg(58 downto 48), -- Post-Trigger window width --