new hit buf entity

diff --git a/32PinAddOn/trb3_periph_32PinAddOn.prj b/32PinAddOn/trb3_periph_32PinAddOn.prj
index 4583d891fdb9a2f56fee34e9f8f89d1a0893dae1..88505111782abfd38763dbed35125bf5b1fbba20 100644 (file)
--- a/32PinAddOn/trb3_periph_32PinAddOn.prj
+++ b/32PinAddOn/trb3_periph_32PinAddOn.prj
@@ -161,6 +161,7 @@ add_file -vhdl -lib "work" "currentRelease/TriggerHandler.vhd"
 add_file -vhdl -lib "work" "currentRelease/up_counter.vhd"
 add_file -vhdl -lib "work" "currentRelease/fallingEdgeDetect.vhd"
 add_file -vhdl -lib "work" "currentRelease/risingEdgeDetect.vhd"
+add_file -vhdl -lib "work" "currentRelease/hit_inv.vhd"
 add_file -vhdl -lib "work" "../base/cores/FIFO_36x128_OutReg.vhd"
 add_file -vhdl -lib "work" "../base/cores/FIFO_DC_36x128_OutReg.vhd"
 add_file -vhdl -lib "work" "../base/code/input_to_trigger_logic.vhd"

diff --git a/base/trb3_components.vhd b/base/trb3_components.vhd
index ee28bf0e93f1b92327d9e89e3710bf017328b147..b4605824b1e387a1cd4099c172c63e298c497553 100644 (file)
--- a/base/trb3_components.vhd
+++ b/base/trb3_components.vhd
@@ -196,6 +196,7 @@ package trb3_components is
       COARSE_COUNTER_IN       : in  std_logic_vector(10 downto 0);
       EPOCH_COUNTER_IN        : in  std_logic_vector(27 downto 0);
       VALID_TIMING_TRG_IN     : in  std_logic;
+      VALID_NOTIMING_TRG_IN   : in  std_logic;
       SPIKE_DETECTED_IN       : in  std_logic;
       MULTI_TMG_TRG_IN        : in  std_logic;
       EPOCH_WRITE_EN_IN       : in  std_logic;
@@ -215,30 +216,31 @@ package trb3_components is
       SIMULATION : integer range 0 to 1;
       REFERENCE  : integer range 0 to 1);
     port (
-      CLK_200              : in  std_logic;
-      RESET_200            : in  std_logic;
-      CLK_100              : in  std_logic;
-      RESET_100            : in  std_logic;
-      RESET_COUNTERS       : in  std_logic;
-      HIT_IN               : in  std_logic;
-      TRIGGER_WIN_END_TDC  : in  std_logic;
-      TRIGGER_WIN_END_RDO  : in  std_logic;
-      EPOCH_COUNTER_IN     : in  std_logic_vector(27 downto 0);
-      COARSE_COUNTER_IN    : in  std_logic_vector(10 downto 0);
-      READ_EN_IN           : in  std_logic;
-      FIFO_DATA_OUT        : out std_logic_vector(35 downto 0);
-      FIFO_DATA_VALID_OUT  : out std_logic;
-      FIFO_EMPTY_OUT       : out std_logic;
-      FIFO_FULL_OUT        : out std_logic;
-      FIFO_ALMOST_FULL_OUT : out std_logic;
-      VALID_TIMING_TRG_IN  : in  std_logic;
-      SPIKE_DETECTED_IN    : in  std_logic;
-      MULTI_TMG_TRG_IN     : in  std_logic;
-      EPOCH_WRITE_EN_IN    : in  std_logic;
-      ENCODER_START_OUT    : out std_logic;
-      ENCODER_FINISHED_OUT : out std_logic;
-      FIFO_WRITE_OUT       : out std_logic;
-      Channel_200_DEBUG    : out std_logic_vector(31 downto 0));
+      CLK_200               : in  std_logic;
+      RESET_200             : in  std_logic;
+      CLK_100               : in  std_logic;
+      RESET_100             : in  std_logic;
+      RESET_COUNTERS        : in  std_logic;
+      HIT_IN                : in  std_logic;
+      TRIGGER_WIN_END_TDC   : in  std_logic;
+      TRIGGER_WIN_END_RDO   : in  std_logic;
+      EPOCH_COUNTER_IN      : in  std_logic_vector(27 downto 0);
+      COARSE_COUNTER_IN     : in  std_logic_vector(10 downto 0);
+      READ_EN_IN            : in  std_logic;
+      FIFO_DATA_OUT         : out std_logic_vector(35 downto 0);
+      FIFO_DATA_VALID_OUT   : out std_logic;
+      FIFO_EMPTY_OUT        : out std_logic;
+      FIFO_FULL_OUT         : out std_logic;
+      FIFO_ALMOST_FULL_OUT  : out std_logic;
+      VALID_TIMING_TRG_IN   : in  std_logic;
+      VALID_NOTIMING_TRG_IN : in  std_logic;
+      SPIKE_DETECTED_IN     : in  std_logic;
+      MULTI_TMG_TRG_IN      : in  std_logic;
+      EPOCH_WRITE_EN_IN     : in  std_logic;
+      ENCODER_START_OUT     : out std_logic;
+      ENCODER_FINISHED_OUT  : out std_logic;
+      FIFO_WRITE_OUT        : out std_logic;
+      Channel_200_DEBUG     : out std_logic_vector(31 downto 0));
   end component;
 
 --  component Channel is

diff --git a/tdc_releases/tdc_v1.6/Channel.vhd b/tdc_releases/tdc_v1.6/Channel.vhd
index 661f5c30438b054b609a06d589fcacbc1c73bcba..43ad70561a2ca82469a43ec882c1f33ec208bb08 100644 (file)
--- a/tdc_releases/tdc_v1.6/Channel.vhd
+++ b/tdc_releases/tdc_v1.6/Channel.vhd
@@ -35,6 +35,7 @@ entity Channel is
     EPOCH_COUNTER_IN        : in  std_logic_vector(27 downto 0);
 --
     VALID_TIMING_TRG_IN     : in  std_logic;
+    VALID_NOTIMING_TRG_IN   : in  std_logic;
     SPIKE_DETECTED_IN       : in  std_logic;
     MULTI_TMG_TRG_IN        : in  std_logic;
 --
@@ -57,8 +58,8 @@ architecture Channel of Channel is
 -------------------------------------------------------------------------------
 
   -- hit signals
-  signal hit_in_i : std_logic;
-  signal hit_buf  : std_logic;
+  --signal hit_in_i : std_logic;
+  signal hit_inv  : std_logic;
 
   -- time stamp
   signal coarse_cntr_reg    : std_logic_vector(10 downto 0);
@@ -113,19 +114,19 @@ architecture Channel of Channel is
 -------------------------------------------------------------------------------
 
   attribute syn_keep                           : boolean;
-  attribute syn_keep of hit_buf                : signal is true;
+--  attribute syn_keep of hit_buf                : signal is true;
   attribute syn_keep of trig_win_end_tdc_i     : signal is true;
   attribute syn_keep of trig_win_end_rdo_i     : signal is true;
   attribute syn_keep of epoch_cntr_reg         : signal is true;
 --  attribute syn_keep of epoch_cntr_2reg        : signal is true;
   attribute syn_preserve                       : boolean;
   attribute syn_preserve of coarse_cntr_reg    : signal is true;
-  attribute syn_preserve of hit_buf            : signal is true;
+--  attribute syn_preserve of hit_buf            : signal is true;
   attribute syn_preserve of trig_win_end_tdc_i : signal is true;
   attribute syn_preserve of epoch_cntr_reg     : signal is true;
 --  attribute syn_preserve of epoch_cntr_2reg    : signal is true;
   attribute nomerge                            : string;
-  attribute nomerge of hit_buf                 : signal is "true";
+--  attribute nomerge of hit_buf                 : signal is "true";
   attribute nomerge of trig_win_end_tdc_i      : signal is "true";
   attribute nomerge of trig_win_end_rdo_i      : signal is "true";
   attribute nomerge of epoch_cntr_reg          : signal is "true";
@@ -136,9 +137,14 @@ architecture Channel of Channel is
 
 begin
 
-  hit_in_i <= HIT_IN;
-  hit_buf  <= not hit_in_i;
-
+  --hit_in_i <= HIT_IN;
+  --hit_buf  <= not hit_in_i;
+  
+  HitInvert: entity work.hit_inv
+    port map (
+      PORT_IN  => HIT_IN,
+      PORT_OUT => hit_inv);
+  
   Channel200 : Channel_200
     generic map (
       CHANNEL_ID => CHANNEL_ID,
@@ -146,30 +152,31 @@ begin
       SIMULATION => SIMULATION,
       REFERENCE  => REFERENCE)
     port map (
-      CLK_200              => CLK_200,
-      RESET_200            => RESET_200,
-      CLK_100              => CLK_100,
-      RESET_100            => RESET_100,
-      RESET_COUNTERS       => RESET_COUNTERS,
-      HIT_IN               => hit_buf,
-      TRIGGER_WIN_END_TDC  => trig_win_end_tdc_i,
-      TRIGGER_WIN_END_RDO  => trig_win_end_rdo_i,
-      EPOCH_COUNTER_IN     => epoch_cntr_reg, --epoch_cntr_2reg,
-      COARSE_COUNTER_IN    => coarse_cntr_reg,
-      READ_EN_IN           => READ_EN_IN,
-      FIFO_DATA_OUT        => ch_data_i,
-      FIFO_DATA_VALID_OUT  => ch_data_valid_i,
-      FIFO_EMPTY_OUT       => ch_empty_i,
-      FIFO_FULL_OUT        => ch_full_i,
-      FIFO_ALMOST_FULL_OUT => ch_almost_full_i,
-      VALID_TIMING_TRG_IN  => VALID_TIMING_TRG_IN,
-      SPIKE_DETECTED_IN    => SPIKE_DETECTED_IN,
-      MULTI_TMG_TRG_IN     => MULTI_TMG_TRG_IN,
-      EPOCH_WRITE_EN_IN    => EPOCH_WRITE_EN_IN,
-      ENCODER_START_OUT    => encoder_start_i,
-      ENCODER_FINISHED_OUT => encoder_finished_i,
-      FIFO_WRITE_OUT       => fifo_write_i,
-      CHANNEL_200_DEBUG    => channel_200_debug_i);
+      CLK_200               => CLK_200,
+      RESET_200             => RESET_200,
+      CLK_100               => CLK_100,
+      RESET_100             => RESET_100,
+      RESET_COUNTERS        => RESET_COUNTERS,
+      HIT_IN                => hit_inv,
+      TRIGGER_WIN_END_TDC   => trig_win_end_tdc_i,
+      TRIGGER_WIN_END_RDO   => trig_win_end_rdo_i,
+      EPOCH_COUNTER_IN      => epoch_cntr_reg,  --epoch_cntr_2reg,
+      COARSE_COUNTER_IN     => coarse_cntr_reg,
+      READ_EN_IN            => READ_EN_IN,
+      FIFO_DATA_OUT         => ch_data_i,
+      FIFO_DATA_VALID_OUT   => ch_data_valid_i,
+      FIFO_EMPTY_OUT        => ch_empty_i,
+      FIFO_FULL_OUT         => ch_full_i,
+      FIFO_ALMOST_FULL_OUT  => ch_almost_full_i,
+      VALID_TIMING_TRG_IN   => VALID_TIMING_TRG_IN,
+      VALID_NOTIMING_TRG_IN => VALID_NOTIMING_TRG_IN,
+      SPIKE_DETECTED_IN     => SPIKE_DETECTED_IN,
+      MULTI_TMG_TRG_IN      => MULTI_TMG_TRG_IN,
+      EPOCH_WRITE_EN_IN     => EPOCH_WRITE_EN_IN,
+      ENCODER_START_OUT     => encoder_start_i,
+      ENCODER_FINISHED_OUT  => encoder_finished_i,
+      FIFO_WRITE_OUT        => fifo_write_i,
+      CHANNEL_200_DEBUG     => channel_200_debug_i);
 
   The_Buffer : FIFO_36x128_OutReg
     port map (
@@ -187,7 +194,7 @@ begin
   FIFO_DATA_VALID_OUT   <= buf_data_valid_i;
   FIFO_EMPTY_OUT        <= buf_empty_i;
   FIFO_ALMOST_EMPTY_OUT <= buf_almost_empty_i;
-  trig_win_end_tdc_i    <= TRIGGER_WIN_END_TDC             when rising_edge(CLK_200);
+  trig_win_end_tdc_i    <= TRIGGER_WIN_END_TDC;--             when rising_edge(CLK_200);
   trig_win_end_rdo_i    <= TRIGGER_WIN_END_RDO             when rising_edge(CLK_100);
   rd_en_reg             <= READ_EN_IN                      when rising_edge(CLK_100);
   buf_empty_reg         <= buf_empty_i                     when rising_edge(CLK_100);

diff --git a/tdc_releases/tdc_v1.6/Channel_200.vhd b/tdc_releases/tdc_v1.6/Channel_200.vhd
index 0fd2bdc0ceedf5f2e511e366f73432e74627996b..c86ad2e63ff5c3e0e5747c48e3ccf9c604c39efb 100644 (file)
--- a/tdc_releases/tdc_v1.6/Channel_200.vhd
+++ b/tdc_releases/tdc_v1.6/Channel_200.vhd
@@ -5,7 +5,7 @@
 -- File       : Channel_200.vhd
 -- Author     : c.ugur@gsi.de
 -- Created    : 2012-08-28
--- Last update: 2014-02-25
+-- Last update: 2014-03-07
 -------------------------------------------------------------------------------
 -- Description: 
 -------------------------------------------------------------------------------
@@ -27,33 +27,34 @@ entity Channel_200 is
     SIMULATION : integer range 0 to 1;
     REFERENCE  : integer range 0 to 1);
   port (
-    CLK_200              : in  std_logic;  -- 200 MHz clk
-    RESET_200            : in  std_logic;  -- reset sync with 200Mhz clk
-    CLK_100              : in  std_logic;  -- 100 MHz clk
-    RESET_100            : in  std_logic;  -- reset sync with 100Mhz clk
-    RESET_COUNTERS       : in  std_logic;  -- reset for counters
+    CLK_200               : in  std_logic;  -- 200 MHz clk
+    RESET_200             : in  std_logic;  -- reset sync with 200Mhz clk
+    CLK_100               : in  std_logic;  -- 100 MHz clk
+    RESET_100             : in  std_logic;  -- reset sync with 100Mhz clk
+    RESET_COUNTERS        : in  std_logic;  -- reset for counters
 --
-    HIT_IN               : in  std_logic;  -- hit in
-    TRIGGER_WIN_END_TDC  : in  std_logic;  -- trigger window end strobe
-    TRIGGER_WIN_END_RDO  : in  std_logic;  -- trigger window end strobe
-    EPOCH_COUNTER_IN     : in  std_logic_vector(27 downto 0);  -- system coarse counter
-    COARSE_COUNTER_IN    : in  std_logic_vector(10 downto 0);
-    READ_EN_IN           : in  std_logic;  -- read en signal
-    FIFO_DATA_OUT        : out std_logic_vector(35 downto 0);  -- fifo data out
-    FIFO_DATA_VALID_OUT  : out std_logic;  -- fifo data valid signal
-    FIFO_EMPTY_OUT       : out std_logic;  -- fifo empty signal
-    FIFO_FULL_OUT        : out std_logic;  -- fifo full signal
-    FIFO_ALMOST_FULL_OUT : out std_logic;
+    HIT_IN                : in  std_logic;  -- hit in
+    TRIGGER_WIN_END_TDC   : in  std_logic;  -- trigger window end strobe
+    TRIGGER_WIN_END_RDO   : in  std_logic;  -- trigger window end strobe
+    EPOCH_COUNTER_IN      : in  std_logic_vector(27 downto 0);  -- system coarse counter
+    COARSE_COUNTER_IN     : in  std_logic_vector(10 downto 0);
+    READ_EN_IN            : in  std_logic;  -- read en signal
+    FIFO_DATA_OUT         : out std_logic_vector(35 downto 0);  -- fifo data out
+    FIFO_DATA_VALID_OUT   : out std_logic;  -- fifo data valid signal
+    FIFO_EMPTY_OUT        : out std_logic;  -- fifo empty signal
+    FIFO_FULL_OUT         : out std_logic;  -- fifo full signal
+    FIFO_ALMOST_FULL_OUT  : out std_logic;
 --
-    VALID_TIMING_TRG_IN  : in  std_logic;
-    SPIKE_DETECTED_IN    : in  std_logic;
-    MULTI_TMG_TRG_IN     : in  std_logic;
+    VALID_TIMING_TRG_IN   : in  std_logic;
+    VALID_NOTIMING_TRG_IN : in  std_logic;
+    SPIKE_DETECTED_IN     : in  std_logic;
+    MULTI_TMG_TRG_IN      : in  std_logic;
 --
-    EPOCH_WRITE_EN_IN    : in  std_logic;
-    ENCODER_START_OUT    : out std_logic;
-    ENCODER_FINISHED_OUT : out std_logic;
-    FIFO_WRITE_OUT       : out std_logic;
-    CHANNEL_200_DEBUG    : out std_logic_vector(31 downto 0)
+    EPOCH_WRITE_EN_IN     : in  std_logic;
+    ENCODER_START_OUT     : out std_logic;
+    ENCODER_FINISHED_OUT  : out std_logic;
+    FIFO_WRITE_OUT        : out std_logic;
+    CHANNEL_200_DEBUG     : out std_logic_vector(31 downto 0)
     );
 
 end Channel_200;
@@ -407,7 +408,8 @@ begin  -- Channel_200
 
   isReference : if REFERENCE = c_YES generate  -- if it is the reference channel
     FSM_PROC : process (FSM_WR_CURRENT, encoder_finished_i, epoch_cntr_updated, TRIGGER_WIN_END_TDC,
-                        trig_win_end_tdc_flag_i, VALID_TIMING_TRG_IN, MULTI_TMG_TRG_IN, SPIKE_DETECTED_IN)
+                        trig_win_end_tdc_flag_i, VALID_TIMING_TRG_IN, VALID_NOTIMING_TRG_IN,
+                        MULTI_TMG_TRG_IN, SPIKE_DETECTED_IN)
     begin
 
       FSM_WR_NEXT      <= WRITE_EPOCH;
@@ -434,7 +436,7 @@ begin  -- Channel_200
           fsm_wr_debug_fsm <= x"1";
 --
         when WAIT_FOR_VALIDITY =>
-          if VALID_TIMING_TRG_IN = '1' then
+          if VALID_TIMING_TRG_IN = '1' or VALID_NOTIMING_TRG_IN = '1'then
             write_epoch_fsm <= '1';
             FSM_WR_NEXT     <= EXCEPTION;
           elsif MULTI_TMG_TRG_IN = '1' or SPIKE_DETECTED_IN = '1' then

diff --git a/tdc_releases/tdc_v1.6/tdc_constraints.lpf b/tdc_releases/tdc_v1.6/tdc_constraints.lpf
index 689eacc83949569b5f279858dd32c5766e2e9668..61811045fa7aafec4624d3432dd6f52a4ec303d2 100644 (file)
--- a/tdc_releases/tdc_v1.6/tdc_constraints.lpf
+++ b/tdc_releases/tdc_v1.6/tdc_constraints.lpf
@@ -17,7 +17,7 @@ UGROUP "Ref_Ch" BBOX 1 51
        BLKNAME THE_TDC/ReferenceChannel/Channel200/SimAdderNo_FC;
 LOCATE UGROUP "Ref_Ch" SITE "R8C131D" ;
 UGROUP "ref_hit" BBOX 1 1
-       BLKNAME THE_TDC/ReferenceChannel/hit_buf_RNO;
+       BLKNAME THE_TDC/ReferenceChannel/HitInvert;
 LOCATE UGROUP "ref_hit" SITE "R9C133D" ;
 UGROUP "Ref_ff_en"  BBOX 1 1
        BLKNAME THE_TDC/ReferenceChannel/Channel200/ff_array_en_i_1_i;
@@ -30,7 +30,7 @@ UGROUP "FC_1" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_1_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_1" SITE "R11C133D" ;
 UGROUP "ff_en_1"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_1_Channels/Channel200/ff_array_en_i_1_i;
@@ -40,7 +40,7 @@ UGROUP "FC_2" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_2_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_2" SITE "R22C133D" ;
 UGROUP "ff_en_2" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_2_Channels/Channel200/ff_array_en_i_1_i;
@@ -50,7 +50,7 @@ UGROUP "FC_3" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_3_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_3" SITE "R24C133D" ;
 UGROUP "ff_en_3" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_3_Channels/Channel200/ff_array_en_i_1_i;
@@ -60,7 +60,7 @@ UGROUP "FC_4" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_4_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_4" SITE "R31C133D" ;
 UGROUP "ff_en_4" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_4_Channels/Channel200/ff_array_en_i_1_i;
@@ -70,7 +70,7 @@ UGROUP "FC_5" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_5_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_5" SITE "R33C133D" ;
 UGROUP "ff_en_5" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_5_Channels/Channel200/ff_array_en_i_1_i;
@@ -80,7 +80,7 @@ UGROUP "FC_6" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_6_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_6" SITE "R36C133D" ;
 UGROUP "ff_en_6" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_6_Channels/Channel200/ff_array_en_i_1_i;
@@ -90,7 +90,7 @@ UGROUP "FC_7" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_7_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_7" SITE "R38C133D" ;
 UGROUP "ff_en_7" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_7_Channels/Channel200/ff_array_en_i_1_i;
@@ -100,7 +100,7 @@ UGROUP "FC_8" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_8_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_8" SITE "R49C133D" ;
 UGROUP "ff_en_8" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_8_Channels/Channel200/ff_array_en_i_1_i;
@@ -110,7 +110,7 @@ UGROUP "FC_9" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_9_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_9" SITE "R51C133D" ;
 UGROUP "ff_en_9" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_9_Channels/Channel200/ff_array_en_i_1_i;
@@ -120,7 +120,7 @@ UGROUP "FC_10" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_10_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_10" SITE "R54C133D" ;
 UGROUP "ff_en_10" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_10_Channels/Channel200/ff_array_en_i_1_i;
@@ -130,7 +130,7 @@ UGROUP "FC_11" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_11_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_11" SITE "R56C133D" ;
 UGROUP "ff_en_11" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_11_Channels/Channel200/ff_array_en_i_1_i;
@@ -140,7 +140,7 @@ UGROUP "FC_12" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_12_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_12" SITE "R11C60D" ;
 UGROUP "ff_en_12" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_12_Channels/Channel200/ff_array_en_i_1_i;
@@ -150,7 +150,7 @@ UGROUP "FC_13" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_13_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_13" SITE "R24C60D" ;
 UGROUP "ff_en_13" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_13_Channels/Channel200/ff_array_en_i_1_i;
@@ -160,7 +160,7 @@ UGROUP "FC_14" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_14_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_14" SITE "R33C60D" ;
 UGROUP "ff_en_14" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_14_Channels/Channel200/ff_array_en_i_1_i;
@@ -170,7 +170,7 @@ UGROUP "FC_15" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_15_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_15" SITE "R38C60D" ;
 UGROUP "ff_en_15" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_15_Channels/Channel200/ff_array_en_i_1_i;
@@ -180,7 +180,7 @@ UGROUP "FC_16" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_16_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_16" SITE "R51C60D" ;
 UGROUP "ff_en_16" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_16_Channels/Channel200/ff_array_en_i_1_i;
@@ -190,7 +190,7 @@ UGROUP "FC_17" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_17_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_17" SITE "R67C133D" ;
 UGROUP "ff_en_17" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_17_Channels/Channel200/ff_array_en_i_1_i;
@@ -200,7 +200,7 @@ UGROUP "FC_18" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_18_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_18" SITE "R69C133D" ;
 UGROUP "ff_en_18" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_18_Channels/Channel200/ff_array_en_i_1_i;
@@ -210,7 +210,7 @@ UGROUP "FC_19" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_19_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_19" SITE "R72C133D" ;
 UGROUP "ff_en_19" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_19_Channels/Channel200/ff_array_en_i_1_i;
@@ -220,7 +220,7 @@ UGROUP "FC_20" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_20_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_20" SITE "R74C133D" ;
 UGROUP "ff_en_20" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_20_Channels/Channel200/ff_array_en_i_1_i;
@@ -230,7 +230,7 @@ UGROUP "FC_21" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_21_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_21" SITE "R85C133D" ;
 UGROUP "ff_en_21" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_21_Channels/Channel200/ff_array_en_i_1_i;
@@ -240,7 +240,7 @@ UGROUP "FC_22" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_22_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_22" SITE "R87C133D" ;
 UGROUP "ff_en_22" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_22_Channels/Channel200/ff_array_en_i_1_i;
@@ -250,7 +250,7 @@ UGROUP "FC_23" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_23_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_23" SITE "R90C133D" ;
 UGROUP "ff_en_23" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_23_Channels/Channel200/ff_array_en_i_1_i;
@@ -260,7 +260,7 @@ UGROUP "FC_24" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_24_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_24" SITE "R92C133D" ;
 UGROUP "ff_en_24" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_24_Channels/Channel200/ff_array_en_i_1_i;
@@ -270,7 +270,7 @@ UGROUP "FC_25" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_25_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_25" SITE "R103C133D" ;
 UGROUP "ff_en_25" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_25_Channels/Channel200/ff_array_en_i_1_i;
@@ -280,7 +280,7 @@ UGROUP "FC_26" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_26_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_26" SITE "R105C133D" ;
 UGROUP "ff_en_26" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_26_Channels/Channel200/ff_array_en_i_1_i;
@@ -290,7 +290,7 @@ UGROUP "FC_27" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_27_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_27" SITE "R112C133D" ;
 UGROUP "ff_en_27" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_27_Channels/Channel200/ff_array_en_i_1_i;
@@ -300,7 +300,7 @@ UGROUP "FC_28" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_28_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_28" SITE "R114C133D" ;
 UGROUP "ff_en_28" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_28_Channels/Channel200/ff_array_en_i_1_i;
@@ -310,7 +310,7 @@ UGROUP "FC_29" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_29_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_29" SITE "R92C60D" ;
 UGROUP "ff_en_29" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_29_Channels/Channel200/ff_array_en_i_1_i;
@@ -320,7 +320,7 @@ UGROUP "FC_30" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_30_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_30" SITE "R105C60D" ;
 UGROUP "ff_en_30" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_30_Channels/Channel200/ff_array_en_i_1_i;
@@ -330,7 +330,7 @@ UGROUP "FC_31" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_31_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_31" SITE "R114C60D" ;
 UGROUP "ff_en_31" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_31_Channels/Channel200/ff_array_en_i_1_i;
@@ -340,7 +340,7 @@ UGROUP "FC_32" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_32_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_32" SITE "R85C60D" ;
 UGROUP "ff_en_32" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_32_Channels/Channel200/ff_array_en_i_1_i;
@@ -350,7 +350,7 @@ UGROUP "FC_33" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_33_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_33" SITE "R9C60D" ;
 UGROUP "ff_en_33" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_33_Channels/Channel200/ff_array_en_i_1_i;
@@ -360,7 +360,7 @@ UGROUP "FC_34" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_34_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_34" SITE "R22C60D" ;
 UGROUP "ff_en_34" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_34_Channels/Channel200/ff_array_en_i_1_i;
@@ -370,7 +370,7 @@ UGROUP "FC_35" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_35_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_35" SITE "R31C60D" ;
 UGROUP "ff_en_35" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_35_Channels/Channel200/ff_array_en_i_1_i;
@@ -380,7 +380,7 @@ UGROUP "FC_36" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_36_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_36" SITE "R36C60D" ;
 UGROUP "ff_en_36" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_36_Channels/Channel200/ff_array_en_i_1_i;
@@ -390,7 +390,7 @@ UGROUP "FC_37" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_37_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_37" SITE "R49C60D" ;
 UGROUP "ff_en_37" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_37_Channels/Channel200/ff_array_en_i_1_i;
@@ -400,7 +400,7 @@ UGROUP "FC_38" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_38_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_38" SITE "R9C4D" ;
 UGROUP "ff_en_38" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_38_Channels/Channel200/ff_array_en_i_1_i;
@@ -410,7 +410,7 @@ UGROUP "FC_39" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_39_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_39" SITE "R11C4D" ;
 UGROUP "ff_en_39" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_39_Channels/Channel200/ff_array_en_i_1_i;
@@ -420,7 +420,7 @@ UGROUP "FC_40" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_40_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_40" SITE "R22C4D" ;
 UGROUP "ff_en_40" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_40_Channels/Channel200/ff_array_en_i_1_i;
@@ -430,7 +430,7 @@ UGROUP "FC_41" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_41_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_41" SITE "R24C4D" ;
 UGROUP "ff_en_41" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_41_Channels/Channel200/ff_array_en_i_1_i;
@@ -440,7 +440,7 @@ UGROUP "FC_42" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_42_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_42" SITE "R31C4D" ;
 UGROUP "ff_en_42" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_42_Channels/Channel200/ff_array_en_i_1_i;
@@ -450,7 +450,7 @@ UGROUP "FC_43" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_43_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_43" SITE "R33C4D" ;
 UGROUP "ff_en_43" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_43_Channels/Channel200/ff_array_en_i_1_i;
@@ -460,7 +460,7 @@ UGROUP "FC_44" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_44_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_44" SITE "R36C4D" ;
 UGROUP "ff_en_44" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_44_Channels/Channel200/ff_array_en_i_1_i;
@@ -470,7 +470,7 @@ UGROUP "FC_45" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_45_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_45" SITE "R38C4D" ;
 UGROUP "ff_en_45" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_45_Channels/Channel200/ff_array_en_i_1_i;
@@ -480,7 +480,7 @@ UGROUP "FC_46" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_46_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_46" SITE "R49C4D" ;
 UGROUP "ff_en_46" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_46_Channels/Channel200/ff_array_en_i_1_i;
@@ -490,7 +490,7 @@ UGROUP "FC_47" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_47_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_47" SITE "R51C4D" ;
 UGROUP "ff_en_47" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_47_Channels/Channel200/ff_array_en_i_1_i;
@@ -500,7 +500,7 @@ UGROUP "FC_48" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_48_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_48" SITE "R54C4D" ;
 UGROUP "ff_en_48" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_48_Channels/Channel200/ff_array_en_i_1_i;
@@ -510,7 +510,7 @@ UGROUP "FC_49" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_49_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_49" SITE "R56C4D" ;
 UGROUP "ff_en_49" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_49_Channels/Channel200/ff_array_en_i_1_i;
@@ -520,7 +520,7 @@ UGROUP "FC_50" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_50_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_50" SITE "R90C60D" ;
 UGROUP "ff_en_50" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_50_Channels/Channel200/ff_array_en_i_1_i;
@@ -530,7 +530,7 @@ UGROUP "FC_51" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_51_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_51" SITE "R103C60D" ;
 UGROUP "ff_en_51" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_51_Channels/Channel200/ff_array_en_i_1_i;
@@ -540,7 +540,7 @@ UGROUP "FC_52" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_52_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_52" SITE "R112C60D" ;
 UGROUP "ff_en_52" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_52_Channels/Channel200/ff_array_en_i_1_i;
@@ -550,7 +550,7 @@ UGROUP "FC_53" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_53_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_53" SITE "R67C4D" ;
 UGROUP "ff_en_53" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_53_Channels/Channel200/ff_array_en_i_1_i;
@@ -560,7 +560,7 @@ UGROUP "FC_54" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_54_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_54" SITE "R69C4D" ;
 UGROUP "ff_en_54" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_54_Channels/Channel200/ff_array_en_i_1_i;
@@ -570,7 +570,7 @@ UGROUP "FC_55" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_55_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_55" SITE "R72C4D" ;
 UGROUP "ff_en_55" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_55_Channels/Channel200/ff_array_en_i_1_i;
@@ -580,7 +580,7 @@ UGROUP "FC_56" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_56_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_56" SITE "R74C4D" ;
 UGROUP "ff_en_56" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_56_Channels/Channel200/ff_array_en_i_1_i;
@@ -590,7 +590,7 @@ UGROUP "FC_57" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_57_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_57" SITE "R85C4D" ;
 UGROUP "ff_en_57" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_57_Channels/Channel200/ff_array_en_i_1_i;
@@ -600,7 +600,7 @@ UGROUP "FC_58" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_58_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_58" SITE "R87C4D" ;
 UGROUP "ff_en_58" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_58_Channels/Channel200/ff_array_en_i_1_i;
@@ -610,7 +610,7 @@ UGROUP "FC_59" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_59_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_59" SITE "R90C4D" ;
 UGROUP "ff_en_59" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_59_Channels/Channel200/ff_array_en_i_1_i;
@@ -620,7 +620,7 @@ UGROUP "FC_60" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_60_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_60" SITE "R92C4D" ;
 UGROUP "ff_en_60" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_60_Channels/Channel200/ff_array_en_i_1_i;
@@ -630,7 +630,7 @@ UGROUP "FC_61" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_61_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_61" SITE "R103C4D" ;
 UGROUP "ff_en_61" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_61_Channels/Channel200/ff_array_en_i_1_i;
@@ -640,7 +640,7 @@ UGROUP "FC_62" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_62_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_62" SITE "R105C4D" ;
 UGROUP "ff_en_62" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_62_Channels/Channel200/ff_array_en_i_1_i;
@@ -650,7 +650,7 @@ UGROUP "FC_63" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_63_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_63" SITE "R112C4D" ;
 UGROUP "ff_en_63" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_63_Channels/Channel200/ff_array_en_i_1_i;
@@ -660,7 +660,7 @@ UGROUP "FC_64" BBOX 1 51
        BLKNAME THE_TDC/GEN_Channels_64_Channels/Channel200/SimAdderNo_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/HitInvert;
 LOCATE UGROUP "hit_64" SITE "R114C4D" ;
 UGROUP "ff_en_64" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_64_Channels/Channel200/ff_array_en_i_1_i;
@@ -904,6 +904,10 @@ UGROUP "TheTdcReadout"  #BBOX 35 57
   ;
 #LOCATE UGROUP "TheTdcReadout" SITE "R53C53D";
 
+UGROUP "TheTriggerHandler"
+  BLKNAME THE_TDC/TheTriggerHandler
+  ;
+LOCATE UGROUP "TheTriggerHandler" SITE "R65C80D";
 
 #############################################################################
 ##                         Unimportant Data Lines                          ##

diff --git a/wasa/trb3_periph_padiwa.prj b/wasa/trb3_periph_padiwa.prj
index 108570956778c2493b5b9406188eb9c1ab050547..054e1b4d2775092628aa048c66a68d87b532957b 100644 (file)
--- a/wasa/trb3_periph_padiwa.prj
+++ b/wasa/trb3_periph_padiwa.prj
@@ -163,6 +163,7 @@ add_file -vhdl -lib "work" "currentRelease/TriggerHandler.vhd"
 add_file -vhdl -lib "work" "currentRelease/up_counter.vhd"
 add_file -vhdl -lib "work" "currentRelease/fallingEdgeDetect.vhd"
 add_file -vhdl -lib "work" "currentRelease/risingEdgeDetect.vhd"
+add_file -vhdl -lib "work" "currentRelease/hit_inv.vhd"
 add_file -vhdl -lib "work" "../base/cores/FIFO_36x128_OutReg.vhd"
 add_file -vhdl -lib "work" "../base/cores/FIFO_DC_36x128_OutReg.vhd"
 add_file -vhdl -lib "work" "../base/code/input_to_trigger_logic.vhd"