From a215e5365ceb793550a55117850ab5db48ddd2b6 Mon Sep 17 00:00:00 2001 From: Cahit Date: Sun, 23 Apr 2017 23:53:11 +0200 Subject: [PATCH] adding Jan s changes --- releases/tdc_v2.3.1/TDC_record.vhd | 35 ++++--- releases/tdc_v2.3.1/tdc_constraints_64.lpf | 116 +++++++++++---------- 2 files changed, 77 insertions(+), 74 deletions(-) diff --git a/releases/tdc_v2.3.1/TDC_record.vhd b/releases/tdc_v2.3.1/TDC_record.vhd index 2cc1213..ccf3572 100644 --- a/releases/tdc_v2.3.1/TDC_record.vhd +++ b/releases/tdc_v2.3.1/TDC_record.vhd @@ -675,8 +675,9 @@ begin status_registers_bus(0)(31 downto 28) <= busreadout_rx.trg_type when rising_edge(CLK_READOUT); -- debug info - status_registers_bus(1)(3 downto 0) <= trg_handler_status_registers(23 downto 20); - status_registers_bus(2) <= trg_time(31 downto 0) when (trg_rdo = '1' and rising_edge(CLK_READOUT)); + status_registers_bus(1)(3 downto 0) <= trg_handler_status_registers(23 downto 20); + status_registers_bus(1)(31 downto 4) <= (others => '0'); + status_registers_bus(2) <= trg_time(31 downto 0) when (trg_rdo = '1' and rising_edge(CLK_READOUT)); -- trigger window status_registers_bus(3)(10 downto 0) <= trg_win_pre; @@ -686,21 +687,21 @@ begin status_registers_bus(3)(31) <= trg_win_en; -- statistics - status_registers_bus(4)(23 downto 0) <= readout_statistics(0); - status_registers_bus(5)(23 downto 0) <= readout_statistics(1); - status_registers_bus(6)(23 downto 0) <= readout_statistics(2); - status_registers_bus(7)(23 downto 0) <= readout_statistics(3); - status_registers_bus(8)(23 downto 0) <= readout_statistics(4); - status_registers_bus(9)(23 downto 0) <= readout_statistics(5); - status_registers_bus(10)(23 downto 0) <= readout_statistics(6); - status_registers_bus(11)(23 downto 0) <= readout_statistics(7); - status_registers_bus(12)(23 downto 0) <= readout_statistics(8); - status_registers_bus(13)(23 downto 0) <= readout_statistics(9); - status_registers_bus(14)(23 downto 0) <= readout_statistics(10); - status_registers_bus(15)(23 downto 0) <= readout_statistics(11); - status_registers_bus(16)(23 downto 0) <= readout_statistics(12); - status_registers_bus(17)(23 downto 0) <= readout_statistics(13); - status_registers_bus(18)(23 downto 0) <= readout_statistics(14); + status_registers_bus(4) <= x"00" & readout_statistics(0); + status_registers_bus(5) <= x"00" & readout_statistics(1); + status_registers_bus(6) <= x"00" & readout_statistics(2); + status_registers_bus(7) <= x"00" & readout_statistics(3); + status_registers_bus(8) <= x"00" & readout_statistics(4); + status_registers_bus(9) <= x"00" & readout_statistics(5); + status_registers_bus(10) <= x"00" & readout_statistics(6); + status_registers_bus(11) <= x"00" & readout_statistics(7); + status_registers_bus(12) <= x"00" & readout_statistics(8); + status_registers_bus(13) <= x"00" & readout_statistics(9); + status_registers_bus(14) <= x"00" & readout_statistics(10); + status_registers_bus(15) <= x"00" & readout_statistics(11); + status_registers_bus(16) <= x"00" & readout_statistics(12); + status_registers_bus(17) <= x"00" & readout_statistics(13); + status_registers_bus(18) <= x"00" & readout_statistics(14); -- Channel debug TheChannelDebugBus : entity work.BusHandler_record diff --git a/releases/tdc_v2.3.1/tdc_constraints_64.lpf b/releases/tdc_v2.3.1/tdc_constraints_64.lpf index 62bd08e..6980adf 100644 --- a/releases/tdc_v2.3.1/tdc_constraints_64.lpf +++ b/releases/tdc_v2.3.1/tdc_constraints_64.lpf @@ -229,80 +229,80 @@ LOCATE UGROUP "ff_en_16" SITE "R23C26D" ; UGROUP "FC_17" BBOX 1 48 BLKNAME THE_TDC/GEN_Channels.17.Channels/Channel200/SimAdderNo.FC ; -LOCATE UGROUP "FC_17" SITE "R104C58D" ; -UGROUP "hitBuf_17" BBOX 1 1 +LOCATE UGROUP "FC_17" SITE "R35C131D" ; +UGROUP "hitBuf_17" BBOX 1 1 BLKNAME THE_TDC/GEN_hit_mux.17.hit_mux_ch ; -LOCATE UGROUP "hitBuf_17" SITE "R105C59D" ; +LOCATE UGROUP "hitBuf_17" SITE "R36C132D" ; UGROUP "ff_en_17" BBOX 1 1 BLKNAME THE_TDC/GEN_Channels.17.Channels/Channel200/ff_array_en_1_i ; -LOCATE UGROUP "ff_en_17" SITE "R104C82D" ; +LOCATE UGROUP "ff_en_17" SITE "R35C155D" ; # UGROUP "FC_18" BBOX 1 48 BLKNAME THE_TDC/GEN_Channels.18.Channels/Channel200/SimAdderNo.FC ; -LOCATE UGROUP "FC_18" SITE "R89C58D" ; -UGROUP "hitBuf_18" BBOX 1 1 +LOCATE UGROUP "FC_18" SITE "R37C131D" ; +UGROUP "hitBuf_18" BBOX 1 1 BLKNAME THE_TDC/GEN_hit_mux.18.hit_mux_ch ; -LOCATE UGROUP "hitBuf_18" SITE "R90C59D" ; +LOCATE UGROUP "hitBuf_18" SITE "R38C132D" ; UGROUP "ff_en_18" BBOX 1 1 BLKNAME THE_TDC/GEN_Channels.18.Channels/Channel200/ff_array_en_1_i ; -LOCATE UGROUP "ff_en_18" SITE "R89C82D" ; +LOCATE UGROUP "ff_en_18" SITE "R37C155D" ; # UGROUP "FC_19" BBOX 1 48 BLKNAME THE_TDC/GEN_Channels.19.Channels/Channel200/SimAdderNo.FC ; -LOCATE UGROUP "FC_19" SITE "R91C58D" ; -UGROUP "hitBuf_19" BBOX 1 1 +LOCATE UGROUP "FC_19" SITE "R48C131D" ; +UGROUP "hitBuf_19" BBOX 1 1 BLKNAME THE_TDC/GEN_hit_mux.19.hit_mux_ch ; -LOCATE UGROUP "hitBuf_19" SITE "R92C59D" ; +LOCATE UGROUP "hitBuf_19" SITE "R49C132D" ; UGROUP "ff_en_19" BBOX 1 1 BLKNAME THE_TDC/GEN_Channels.19.Channels/Channel200/ff_array_en_1_i ; -LOCATE UGROUP "ff_en_19" SITE "R91C82D" ; +LOCATE UGROUP "ff_en_19" SITE "R48C155D" ; # UGROUP "FC_20" BBOX 1 48 BLKNAME THE_TDC/GEN_Channels.20.Channels/Channel200/SimAdderNo.FC ; -LOCATE UGROUP "FC_20" SITE "R102C58D" ; -UGROUP "hitBuf_20" BBOX 1 1 +LOCATE UGROUP "FC_20" SITE "R50C131D" ; +UGROUP "hitBuf_20" BBOX 1 1 BLKNAME THE_TDC/GEN_hit_mux.20.hit_mux_ch ; -LOCATE UGROUP "hitBuf_20" SITE "R103C59D" ; +LOCATE UGROUP "hitBuf_20" SITE "R51C132D" ; UGROUP "ff_en_20" BBOX 1 1 BLKNAME THE_TDC/GEN_Channels.20.Channels/Channel200/ff_array_en_1_i ; -LOCATE UGROUP "ff_en_20" SITE "R102C82D" ; +LOCATE UGROUP "ff_en_20" SITE "R50C155D" ; # UGROUP "FC_21" BBOX 1 48 BLKNAME THE_TDC/GEN_Channels.21.Channels/Channel200/SimAdderNo.FC ; -LOCATE UGROUP "FC_21" SITE "R111C58D" ; -UGROUP "hitBuf_21" BBOX 1 1 +LOCATE UGROUP "FC_21" SITE "R30C131D" ; +UGROUP "hitBuf_21" BBOX 1 1 BLKNAME THE_TDC/GEN_hit_mux.21.hit_mux_ch ; -LOCATE UGROUP "hitBuf_21" SITE "R112C59D" ; +LOCATE UGROUP "hitBuf_21" SITE "R31C132D" ; UGROUP "ff_en_21" BBOX 1 1 BLKNAME THE_TDC/GEN_Channels.21.Channels/Channel200/ff_array_en_1_i ; -LOCATE UGROUP "ff_en_21" SITE "R111C82D" ; +LOCATE UGROUP "ff_en_21" SITE "R30C155D" ; # UGROUP "FC_22" BBOX 1 48 - BLKNAME THE_TDC/GEN_Channels.22.Channels/Channel200/SimAdderNo.FC - ; -LOCATE UGROUP "FC_22" SITE "R113C58D" ; -UGROUP "hitBuf_22" BBOX 1 1 + BLKNAME THE_TDC/GEN_Channels.22.Channels/Channel200/SimAdderNo.FC + ; +LOCATE UGROUP "FC_22" SITE "R32C131D" ; +UGROUP "hitBuf_22" BBOX 1 1 BLKNAME THE_TDC/GEN_hit_mux.22.hit_mux_ch ; -LOCATE UGROUP "hitBuf_22" SITE "R114C59D" ; +LOCATE UGROUP "hitBuf_22" SITE "R33C132D" ; UGROUP "ff_en_22" BBOX 1 1 BLKNAME THE_TDC/GEN_Channels.22.Channels/Channel200/ff_array_en_1_i ; -LOCATE UGROUP "ff_en_22" SITE "R113C82D" ; +LOCATE UGROUP "ff_en_22" SITE "R32C155D" ; # UGROUP "FC_23" BBOX 1 48 BLKNAME THE_TDC/GEN_Channels.23.Channels/Channel200/SimAdderNo.FC @@ -697,80 +697,80 @@ LOCATE UGROUP "ff_en_52" SITE "R23C155D" ; UGROUP "FC_53" BBOX 1 48 BLKNAME THE_TDC/GEN_Channels.53.Channels/Channel200/SimAdderNo.FC ; -LOCATE UGROUP "FC_53" SITE "R30C131D" ; -UGROUP "hitBuf_53" BBOX 1 1 +LOCATE UGROUP "FC_53" SITE "R104C58D" ; +UGROUP "hitBuf_53" BBOX 1 1 BLKNAME THE_TDC/GEN_hit_mux.53.hit_mux_ch ; -LOCATE UGROUP "hitBuf_53" SITE "R31C132D" ; +LOCATE UGROUP "hitBuf_53" SITE "R105C59D" ; UGROUP "ff_en_53" BBOX 1 1 BLKNAME THE_TDC/GEN_Channels.53.Channels/Channel200/ff_array_en_1_i ; -LOCATE UGROUP "ff_en_53" SITE "R30C155D" ; +LOCATE UGROUP "ff_en_53" SITE "R104C82D" ; # UGROUP "FC_54" BBOX 1 48 - BLKNAME THE_TDC/GEN_Channels.54.Channels/Channel200/SimAdderNo.FC - ; -LOCATE UGROUP "FC_54" SITE "R32C131D" ; -UGROUP "hitBuf_54" BBOX 1 1 + BLKNAME THE_TDC/GEN_Channels.54.Channels/Channel200/SimAdderNo.FC + ; +LOCATE UGROUP "FC_54" SITE "R89C58D" ; +UGROUP "hitBuf_54" BBOX 1 1 BLKNAME THE_TDC/GEN_hit_mux.54.hit_mux_ch ; -LOCATE UGROUP "hitBuf_54" SITE "R33C132D" ; +LOCATE UGROUP "hitBuf_54" SITE "R90C59D" ; UGROUP "ff_en_54" BBOX 1 1 BLKNAME THE_TDC/GEN_Channels.54.Channels/Channel200/ff_array_en_1_i ; -LOCATE UGROUP "ff_en_54" SITE "R32C155D" ; +LOCATE UGROUP "ff_en_54" SITE "R89C82D" ; # UGROUP "FC_55" BBOX 1 48 BLKNAME THE_TDC/GEN_Channels.55.Channels/Channel200/SimAdderNo.FC ; -LOCATE UGROUP "FC_55" SITE "R35C131D" ; -UGROUP "hitBuf_55" BBOX 1 1 +LOCATE UGROUP "FC_55" SITE "R91C58D" ; +UGROUP "hitBuf_55" BBOX 1 1 BLKNAME THE_TDC/GEN_hit_mux.55.hit_mux_ch ; -LOCATE UGROUP "hitBuf_55" SITE "R36C132D" ; +LOCATE UGROUP "hitBuf_55" SITE "R92C59D" ; UGROUP "ff_en_55" BBOX 1 1 BLKNAME THE_TDC/GEN_Channels.55.Channels/Channel200/ff_array_en_1_i ; -LOCATE UGROUP "ff_en_55" SITE "R35C155D" ; +LOCATE UGROUP "ff_en_55" SITE "R91C82D" ; # UGROUP "FC_56" BBOX 1 48 BLKNAME THE_TDC/GEN_Channels.56.Channels/Channel200/SimAdderNo.FC ; -LOCATE UGROUP "FC_56" SITE "R37C131D" ; -UGROUP "hitBuf_56" BBOX 1 1 +LOCATE UGROUP "FC_56" SITE "R102C58D" ; +UGROUP "hitBuf_56" BBOX 1 1 BLKNAME THE_TDC/GEN_hit_mux.56.hit_mux_ch ; -LOCATE UGROUP "hitBuf_56" SITE "R38C132D" ; +LOCATE UGROUP "hitBuf_56" SITE "R103C59D" ; UGROUP "ff_en_56" BBOX 1 1 BLKNAME THE_TDC/GEN_Channels.56.Channels/Channel200/ff_array_en_1_i ; -LOCATE UGROUP "ff_en_56" SITE "R37C155D" ; -# +LOCATE UGROUP "ff_en_56" SITE "R102C82D" ; + UGROUP "FC_57" BBOX 1 48 BLKNAME THE_TDC/GEN_Channels.57.Channels/Channel200/SimAdderNo.FC ; -LOCATE UGROUP "FC_57" SITE "R48C131D" ; -UGROUP "hitBuf_57" BBOX 1 1 +LOCATE UGROUP "FC_57" SITE "R111C58D" ; +UGROUP "hitBuf_57" BBOX 1 1 BLKNAME THE_TDC/GEN_hit_mux.57.hit_mux_ch ; -LOCATE UGROUP "hitBuf_57" SITE "R49C132D" ; +LOCATE UGROUP "hitBuf_57" SITE "R112C59D" ; UGROUP "ff_en_57" BBOX 1 1 BLKNAME THE_TDC/GEN_Channels.57.Channels/Channel200/ff_array_en_1_i ; -LOCATE UGROUP "ff_en_57" SITE "R48C155D" ; +LOCATE UGROUP "ff_en_57" SITE "R111C82D" ; # UGROUP "FC_58" BBOX 1 48 BLKNAME THE_TDC/GEN_Channels.58.Channels/Channel200/SimAdderNo.FC ; -LOCATE UGROUP "FC_58" SITE "R50C131D" ; -UGROUP "hitBuf_58" BBOX 1 1 +LOCATE UGROUP "FC_58" SITE "R113C58D" ; +UGROUP "hitBuf_58" BBOX 1 1 BLKNAME THE_TDC/GEN_hit_mux.58.hit_mux_ch ; -LOCATE UGROUP "hitBuf_58" SITE "R51C132D" ; +LOCATE UGROUP "hitBuf_58" SITE "R114C59D" ; UGROUP "ff_en_58" BBOX 1 1 BLKNAME THE_TDC/GEN_Channels.58.Channels/Channel200/ff_array_en_1_i ; -LOCATE UGROUP "ff_en_58" SITE "R50C155D" ; +LOCATE UGROUP "ff_en_58" SITE "R113C82D" ; # UGROUP "FC_59" BBOX 1 48 BLKNAME THE_TDC/GEN_Channels.59.Channels/Channel200/SimAdderNo.FC @@ -914,14 +914,16 @@ UGROUP "EF_CB1" BBOX 16 49 BLKNAME THE_TDC/GEN_Channels.20.Channels/Channel200 BLKNAME THE_TDC/GEN_Channels.20.Channels/Buffer_128.The_Buffer ; -LOCATE UGROUP "EF_CB1" SITE "R89C58D" ; +# LOCATE UGROUP "EF_CB1" SITE "R89C58D" ; +LOCATE UGROUP "EF_CB1" SITE "R35C131D" ; UGROUP "EF_CB2" BBOX 10 49 BLKNAME THE_TDC/GEN_Channels.21.Channels/Channel200 BLKNAME THE_TDC/GEN_Channels.21.Channels/Buffer_128.The_Buffer BLKNAME THE_TDC/GEN_Channels.22.Channels/Channel200 BLKNAME THE_TDC/GEN_Channels.22.Channels/Buffer_128.The_Buffer ; -LOCATE UGROUP "EF_CB2" SITE "R105C58D" ; +#LOCATE UGROUP "EF_CB2" SITE "R105C58D" ; +LOCATE UGROUP "EF_CB2" SITE "R24C131D" ; UGROUP "EF_LC2" BBOX 17 49 BLKNAME THE_TDC/GEN_Channels.23.Channels/Channel200 BLKNAME THE_TDC/GEN_Channels.23.Channels/Buffer_128.The_Buffer @@ -1015,7 +1017,7 @@ UGROUP "EF_RT2" BBOX 17 49 BLKNAME THE_TDC/GEN_Channels.54.Channels/Channel200 BLKNAME THE_TDC/GEN_Channels.54.Channels/Buffer_128.The_Buffer ; -LOCATE UGROUP "EF_RT2" SITE "R24C131D" ; +LOCATE UGROUP "EF_RT2" SITE "R105C58D" ; UGROUP "EF_RC1" BBOX 17 49 BLKNAME THE_TDC/GEN_Channels.55.Channels/Channel200 BLKNAME THE_TDC/GEN_Channels.55.Channels/Buffer_128.The_Buffer @@ -1026,7 +1028,7 @@ UGROUP "EF_RC1" BBOX 17 49 BLKNAME THE_TDC/GEN_Channels.58.Channels/Channel200 BLKNAME THE_TDC/GEN_Channels.58.Channels/Buffer_128.The_Buffer ; -LOCATE UGROUP "EF_RC1" SITE "R35C131D" ; +LOCATE UGROUP "EF_RC1" SITE "R89C58D" ; UGROUP "EF_RC2" BBOX 17 49 BLKNAME THE_TDC/GEN_Channels.59.Channels/Channel200 BLKNAME THE_TDC/GEN_Channels.59.Channels/Buffer_128.The_Buffer -- 2.43.0