improved logic for better timing performance - cu

diff --git a/tdc_releases/tdc_v0.5/Channel.vhd b/tdc_releases/tdc_v0.5/Channel.vhd
index 74f16799b33b2bafbabe7b4c4bab59e1d2eb3847..87c30d2874643d62f66c25757c6c2509db281531 100644 (file)
--- a/tdc_releases/tdc_v0.5/Channel.vhd
+++ b/tdc_releases/tdc_v0.5/Channel.vhd
@@ -43,8 +43,13 @@ architecture Channel of Channel is
 -- Signal Declarations
 -------------------------------------------------------------------------------
 
-  signal hit_in_i      : std_logic;
-  signal hit_buf       : std_logic;
+  signal hit_in_i       : std_logic;
+  signal hit_buf        : std_logic;
+  signal hit_detect_reg : std_logic;
+
+  -- time stamp
+  signal time_stamp_i   : std_logic_vector(10 downto 0);
+  signal time_stamp_reg : std_logic_vector(10 downto 0);
 
 -------------------------------------------------------------------------------
 -- Debug Signals
@@ -65,20 +70,15 @@ architecture Channel of Channel is
 
 -------------------------------------------------------------------------------
 
-  attribute syn_keep             : boolean;
-  attribute syn_keep of hit_buf  : signal is true;  
---  attribute syn_keep of hit_in_i : signal is true;
---  attribute NOMERGE              : string;
---  attribute NOMERGE of hit_buf   : signal is "true";
---  attribute NOMERGE of hit_in_i  : signal is "true";
-
+  attribute syn_keep            : boolean;
+  attribute syn_keep of hit_buf : signal is true;
 
 -------------------------------------------------------------------------------
 
 begin
 
-  hit_in_i      <= HIT_IN;
-  hit_buf       <= not hit_in_i;
+  hit_in_i <= HIT_IN;
+  hit_buf  <= not hit_in_i;
 
   Channel_200_1 : Channel_200
     generic map (
@@ -89,7 +89,9 @@ begin
       CLK_100              => CLK_100,
       RESET_100            => RESET_100,
       HIT_IN               => hit_buf,
-      COARSE_CNTR_IN       => COARSE_COUNTER_IN,
+      HIT_DETECT_OUT       => hit_detect_reg,
+--      COARSE_CNTR_IN       => COARSE_COUNTER_IN,
+      TIME_STAMP_IN        => time_stamp_reg,
       READ_EN_IN           => READ_EN_IN,
       FIFO_DATA_OUT        => FIFO_DATA_OUT,
       FIFO_EMPTY_OUT       => FIFO_EMPTY_OUT,
@@ -98,6 +100,20 @@ begin
       FIFO_WR_OUT          => fifo_wr_i ,
       ENCODER_START_OUT    => encoder_start_i);
 
+  --purpose: Captures the time stamp of the hit
+  TimeStamp : process (CLK_200)
+  begin
+    if rising_edge(CLK_200) then
+      if RESET_200 = '1' then
+        time_stamp_i <= (others => '0');
+      elsif hit_detect_reg = '1' then
+        time_stamp_i <= COARSE_COUNTER_IN;
+      end if;
+    end if;
+  end process TimeStamp;
+
+  time_stamp_reg <= time_stamp_i when rising_edge(CLK_200);
+
 -------------------------------------------------------------------------------
 -- Lost Hit Detection
 -------------------------------------------------------------------------------

diff --git a/tdc_releases/tdc_v0.5/Channel_200.vhd b/tdc_releases/tdc_v0.5/Channel_200.vhd
index 288777e3ade17d4172b8e9bb1b6436b4bba8b439..ba2e7338b65b03518ece9cada5c15debf8f803d8 100644 (file)
--- a/tdc_releases/tdc_v0.5/Channel_200.vhd
+++ b/tdc_releases/tdc_v0.5/Channel_200.vhd
@@ -5,7 +5,7 @@
 -- File       : Channel_200.vhd
 -- Author     : c.ugur@gsi.de
 -- Created    : 2012-08-28
--- Last update: 2012-08-28
+-- Last update: 2012-09-03
 -------------------------------------------------------------------------------
 -- Description: 
 -------------------------------------------------------------------------------
@@ -39,7 +39,9 @@ entity Channel_200 is
     RESET_100            : in  std_logic;   -- reset sync with 100Mhz clk
 --
     HIT_IN               : in  std_logic;   -- hit in
-    COARSE_CNTR_IN       : in  std_logic_vector(10 downto 0);  -- coarse counter in
+    HIT_DETECT_OUT       : out std_logic;   -- hit detect reg out
+--    COARSE_CNTR_IN       : in  std_logic_vector(10 downto 0);  -- coarse counter in
+    TIME_STAMP_IN        : in  std_logic_vector(10 downto 0);  -- time stamp in 
     READ_EN_IN           : in  std_logic;   -- read en signal
     FIFO_DATA_OUT        : out std_logic_vector(31 downto 0);  -- fifo data out
     FIFO_EMPTY_OUT       : out std_logic;   -- fifo empty signal
@@ -65,7 +67,8 @@ architecture Channel_200 of Channel_200 is
   signal hit_detect_2reg : std_logic;
 
   -- time stamp
-  signal time_stamp_i : std_logic_vector(10 downto 0);
+  signal time_stamp_i   : std_logic_vector(10 downto 0);
+  signal time_stamp_reg : std_logic_vector(10 downto 0);
 
   -- encoder
   signal encoder_start_i    : std_logic;
@@ -105,19 +108,8 @@ begin  -- Channel_200
                                                           -- hit detection bit
   hit_detect_reg  <= hit_detect_i   when rising_edge(CLK_200);
   hit_detect_2reg <= hit_detect_reg when rising_edge(CLK_200);
-
-  --purpose: Captures the time stamp of the hit
-  TimeStamp : process (CLK_200)
-  begin
-    if rising_edge(CLK_200) then
-      if RESET_200 = '1' then
-        time_stamp_i <= (others => '0');
-      elsif hit_detect_reg = '1' then
-        time_stamp_i <= COARSE_CNTR_IN;
-      end if;
-    end if;
-  end process TimeStamp;
-
+  time_stamp_reg  <= TIME_STAMP_IN  when rising_edge(CLK_200);
+  HIT_DETECT_OUT  <= hit_detect_reg;
   encoder_start_i <= hit_detect_reg;
 
   --purpose: Encoder
@@ -149,7 +141,7 @@ begin  -- Channel_200
   fifo_data_in_i(28 downto 22) <= conv_std_logic_vector(CHANNEL_ID, 7);  -- channel number
   fifo_data_in_i(21 downto 12) <= encoder_data_out_i;  -- fine time from the encoder
   fifo_data_in_i(11)           <= '1';  --edge_type_i;  -- rising '1' or falling '0' edge
-  fifo_data_in_i(10 downto 0)  <= time_stamp_i;    -- hit time stamp
+  fifo_data_in_i(10 downto 0)  <= time_stamp_reg;      -- hit time stamp
 
   RegisterOutputs : process (CLK_100)
   begin

diff --git a/tdc_releases/tdc_v0.5/Reference_channel.vhd b/tdc_releases/tdc_v0.5/Reference_channel.vhd
index 0ebb5a622b3bd20c6eb431fe19c0c682be841917..a143dbf28685e0bdad9a10674fcbcc80d9d591cc 100644 (file)
--- a/tdc_releases/tdc_v0.5/Reference_channel.vhd
+++ b/tdc_releases/tdc_v0.5/Reference_channel.vhd
@@ -52,6 +52,7 @@ architecture Reference_Channel of Reference_Channel is
   signal hit_detect_2reg    : std_logic;
   signal result_2_reg       : std_logic;
   signal hit_time_stamp_i   : std_logic_vector(10 downto 0);
+  signal hit_time_stamp_reg : std_logic_vector(10 downto 0);
   signal fine_counter_i     : std_logic_vector(9 downto 0);
   signal fine_counter_reg   : std_logic_vector(9 downto 0);
   signal encoder_start_i    : std_logic;
@@ -76,19 +77,16 @@ architecture Reference_Channel of Reference_Channel is
 
   attribute syn_keep                  : boolean;
   attribute syn_keep of hit_buf       : signal is true;
---  attribute syn_keep of hit_in_i      : signal is true;
   attribute syn_keep of ff_array_en_i : signal is true;
-  --attribute NOMERGE                   : string;
-  --attribute NOMERGE of hit_buf        : signal is "true";
-  --attribute NOMERGE of ff_array_en_i  : signal is "true";
+  attribute NOMERGE                   : string;
+  attribute NOMERGE of hit_buf        : signal is "true";
 -------------------------------------------------------------------------------
 
 begin
 
---  hit_in_i      <= HIT_IN;
-  hit_buf       <= not HIT_IN;
+  hit_in_i <= HIT_IN;
+  hit_buf  <= not hit_in_i;
 
-  
   --purpose: Tapped Delay Line 304 (Carry Chain) with wave launcher (21) double transition
   FC : Adder_304
     port map (
@@ -124,36 +122,20 @@ begin
     hit_detect_i <= ((not result_2_reg) and result_i(2));
   end process Hit_Detect;
 
-  ----purpose: Double Synchroniser
-  --Double_Syncroniser : process (CLK_WR)
-  --begin
-  --  if rising_edge(CLK_WR) then
-  --    if RESET_WR = '1' then
-  --      result_reg <= (others => '1');
-  --    elsif hit_detect_i = '1' then
-  --      result_reg <= result_i;
-  --    end if;
-  --  end if;
-  --end process Double_Syncroniser;
-
   --purpose: Start Encoder and captures the time stamp of the hit
   Start_Encoder : process (CLK_WR)
   begin
     if rising_edge(CLK_WR) then
       if RESET_WR = '1' then
---        encoder_start_i  <= '0';
         hit_time_stamp_i <= (others => '0');
       elsif hit_detect_reg = '1' then
---        encoder_start_i  <= '1';
         hit_time_stamp_i <= COARSE_COUNTER_IN;
---      else
---        encoder_start_i <= '0';
       end if;
     end if;
   end process Start_Encoder;
-  encoder_start_i <= hit_detect_reg;
-
-  TRIGGER_TIME_OUT <= hit_time_stamp_i;  -- coarse time of the timing trigger
+  encoder_start_i    <= hit_detect_reg;
+  hit_time_stamp_reg <= hit_time_stamp_i when rising_edge(CLK_WR);
+  TRIGGER_TIME_OUT   <= hit_time_stamp_reg;  -- coarse time of the timing trigger
 
   --purpose: Encoder
   Encoder : Encoder_304_Bit
@@ -195,7 +177,7 @@ begin
   fifo_data_in_i(28 downto 22) <= conv_std_logic_vector(CHANNEL_ID, 7);  -- channel number
   fifo_data_in_i(21 downto 12) <= fine_counter_reg;  -- fine time from the encoder
   fifo_data_in_i(11)           <= '1';  --edge_type_i;  -- rising '1'  or falling '0' edge
-  fifo_data_in_i(10 downto 0)  <= hit_time_stamp_i;  -- hit time stamp
+  fifo_data_in_i(10 downto 0)  <= hit_time_stamp_reg;  -- hit time stamp
 
   Register_Outputs : process (CLK_RD, RESET_RD)
   begin

diff --git a/tdc_releases/tdc_v0.5/TDC.vhd b/tdc_releases/tdc_v0.5/TDC.vhd
index 69b551c1e37a4f5754d30409fa4374634ebf4537..4077035bafd1d862ee6cbd414e955892eb5b4d79 100644 (file)
--- a/tdc_releases/tdc_v0.5/TDC.vhd
+++ b/tdc_releases/tdc_v0.5/TDC.vhd
@@ -136,6 +136,7 @@ architecture TDC of TDC is
   type   Std_Logic_8_array is array (0 to 8) of std_logic_vector(3 downto 0);
   signal fifo_nr_hex           : Std_Logic_8_array;
   signal coarse_cnt            : std_logic_vector(10 downto 0);
+  signal coarse_cnt_reg        : std_logic_vector(10 downto 0);
   signal reset_coarse_cnt      : std_logic;
   signal channel_full_i        : std_logic_vector(CHANNEL_NUMBER-1 downto 0);
   signal channel_almost_full_i : std_logic_vector(CHANNEL_NUMBER-1 downto 0);
@@ -249,7 +250,7 @@ begin
       FIFO_EMPTY_OUT       => channel_empty_i(0),
       FIFO_FULL_OUT        => channel_full_i(0),
       FIFO_ALMOST_FULL_OUT => channel_almost_full_i(0),
-      COARSE_COUNTER_IN    => coarse_cnt,
+      COARSE_COUNTER_IN    => coarse_cnt_reg,
       TRIGGER_TIME_OUT     => trigger_time_i,
       REF_DEBUG_OUT        => ref_debug_i);
 
@@ -274,7 +275,7 @@ begin
         FIFO_EMPTY_OUT       => channel_empty_i(i),
         FIFO_FULL_OUT        => channel_full_i(i),
         FIFO_ALMOST_FULL_OUT => channel_almost_full_i(i),
-        COARSE_COUNTER_IN    => coarse_cnt,
+        COARSE_COUNTER_IN    => coarse_cnt_reg,
         LOST_HIT_NUMBER      => channel_lost_hit_number(i),
         HIT_DETECT_NUMBER    => channel_hit_detect_number(i),
         ENCODER_START_NUMBER => channel_encoder_start_number(i),
@@ -292,6 +293,7 @@ begin
       RESET     => reset_coarse_cnt,
       COUNT_OUT => coarse_cnt,
       UP_IN     => '1');
+  coarse_cnt_reg  <= coarse_cnt     when rising_edge(CLK_TDC);
 
   -- Trigger mode control register synchronised to the coarse counter clk
   Readout_trigger_mode_sync : bit_sync
@@ -322,7 +324,7 @@ begin
       pulse     => start_trg_win_cnt_200_pulse);
 
   trg_win_post_200 <= TRG_WIN_POST when rising_edge(CLK_TDC);
-    
+
   TriggerWinEndSync : bit_sync
     generic map (
       DEPTH => 3)
@@ -332,7 +334,7 @@ begin
       CLK1  => CLK_READOUT,
       D_IN  => trg_win_end_200,
       D_OUT => trg_win_end_100);
-  
+
   TriggerWinEndPulse100 : edge_to_pulse
     port map (
       clock     => CLK_READOUT,
@@ -390,11 +392,11 @@ begin
     if rising_edge(CLK_TDC) then
       if reset_tdc(0) = '1' then
         trg_win_end_200 <= '0';
-        trg_win_cnt     <= ('1' & trg_win_post_200)-20;
+        trg_win_cnt     <= '1' & trg_win_post_200;
       elsif start_trg_win_cnt_200_pulse = '1' then
         trg_win_end_200 <= '0';
         trg_win_cnt     <= "000000000001";
-      elsif trg_win_cnt(10 downto 0) = trg_win_post_200 - 20 then
+      elsif trg_win_cnt(10 downto 0) = trg_win_post_200 then
         trg_win_end_200 <= '1';
         trg_win_cnt(11) <= '1';
       else
@@ -1072,8 +1074,8 @@ begin
         logic_analyser_reg(9)            <= data_wr_reg;
         logic_analyser_reg(15 downto 10) <= data_out_reg(27 downto 22);
 
-      --elsif logic_anal_control = x"4" then  -- channel debugging
-      --  logic_analyser_reg <= channel_debug_i(1)(15 downto 0);
+        --elsif logic_anal_control = x"4" then  -- channel debugging
+        --  logic_analyser_reg <= channel_debug_i(1)(15 downto 0);
       end if;
     end if;
   end process REG_LOGIC_ANALYSER_OUTPUT;

diff --git a/tdc_releases/tdc_v0.5/trb3_periph.vhd b/tdc_releases/tdc_v0.5/trb3_periph.vhd
index 4d35df04afb397b0c68d6184ac3dbc2a2f9a15c8..c43888fc1fb24f5419f2b6d8245a2b9b26a2536e 100644 (file)
--- a/tdc_releases/tdc_v0.5/trb3_periph.vhd
+++ b/tdc_releases/tdc_v0.5/trb3_periph.vhd
@@ -580,7 +580,7 @@ begin
 
   THE_TDC : TDC
     generic map (
-      CHANNEL_NUMBER => 3,              -- Number of TDC channels
+      CHANNEL_NUMBER => 65,              -- Number of TDC channels
       STATUS_REG_NR  => REGIO_NUM_STAT_REGS,
       CONTROL_REG_NR => REGIO_NUM_CTRL_REGS)
     port map (
@@ -588,7 +588,7 @@ begin
       CLK_TDC               => CLK_PCLK_LEFT,  -- 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(2 downto 1),  -- Channel start signals
+      HIT_IN                => hit_in_i(64 downto 1),  -- Channel start signals
       TRG_WIN_PRE           => ctrl_reg(42 downto 32),  -- Pre-Trigger window width
       TRG_WIN_POST          => ctrl_reg(58 downto 48),  -- Post-Trigger window width
       --

diff --git a/tdc_releases/tdc_v0.5/trb3_periph_constraints.lpf b/tdc_releases/tdc_v0.5/trb3_periph_constraints.lpf
index a2e2691250d04fcc6b3195a958b7fa797ea4f49e..1ccf3e4ee2d08725713129528ca2d89c718066f1 100644 (file)
--- a/tdc_releases/tdc_v0.5/trb3_periph_constraints.lpf
+++ b/tdc_releases/tdc_v0.5/trb3_periph_constraints.lpf
@@ -12,10 +12,8 @@ GSR_NET NET "GSR_N";
 #################################################################
 LOCATE COMP   "THE_MEDIA_UPLINK/gen_serdes_1_200_THE_SERDES/PCSD_INST" SITE "PCSA" ;
 
-REGION "MEDIA_UPLINK" "R105C104D" 10 20;
-#REGION "MEDIA_UPLINK" "R82C110D" 33 10;
-REGION "REGION_SPI"   "R11C164D" 10 18 DEVSIZE;
-#REGION "REGION_IOBUF" "R10C43D"  88 86 DEVSIZE;
+REGION "MEDIA_UPLINK" "R105C104D" 10 27;
+REGION "REGION_SPI"   "R2C104D" 15 18 DEVSIZE;
 
 LOCATE UGROUP "THE_SPI_MASTER/SPI_group" REGION "REGION_SPI" ; 
 LOCATE UGROUP "THE_SPI_MEMORY/SPI_group" REGION "REGION_SPI" ;
@@ -26,6 +24,31 @@ MULTICYCLE TO CELL "THE_MEDIA_DOWNLINK/SCI_DATA_OUT*" 50 ns;
 MULTICYCLE TO CELL "THE_MEDIA_UPLINK/SCI_DATA_OUT*" 50 ns;
 MULTICYCLE TO CELL "THE_RESET_HANDLER/final_reset*" 30 ns;
 
+
+#Jan: Placement of TrbNet components (at least, most of them)
+REGION "REGION_TRBNET" "R38C104D"  67 27 DEVSIZE;
+#UGROUP "TrbNet" BBOX 77 27 
+#  BLKNAME THE_ENDPOINT
+#  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_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";
+
 #################################################################
 # TDC Constraints
 #################################################################
@@ -55,187 +78,193 @@ MULTICYCLE TO CELL "THE_RESET_HANDLER/final_reset*" 30 ns;
 #REGION "Region_E&F_19" "R74C10D"   10 44 DEVSIZE;
 
 
+PROHIBIT SECONDARY NET "THE_TDC/The_Reference_Time/ff_array_en_i";
+PROHIBIT SECONDARY NET "THE_TDC/GEN_Channels_*_Channels/Channel_200_1/ff_array_en_i";
+
+
 ##############################################################################
 ##                     REFERENCE CHANNEL PLACEMENT                         ##
 ##############################################################################
 UGROUP "Ref_Ch" BBOX 1 51 
        BLKNAME THE_TDC/The_Reference_Time/FC;
-LOCATE UGROUP "Ref_Ch" SITE "R8C119D" ;
-LOCATE COMP TRIGGER_LEFT_pad_RNIM301 SITE "R9C121D" ;
-UGROUP "Ref_ff_en" 
+LOCATE UGROUP "Ref_Ch" SITE "R8C131D" ;
+UGROUP "ref_hit" BBOX 1 1
+       BLKNAME THE_TDC/The_Reference_Time/hit_buf_RNO;
+LOCATE UGROUP "ref_hit" SITE "R9C133D" ;
+UGROUP "Ref_ff_en"  BBOX 1 1
        BLKNAME THE_TDC/The_Reference_Time/ff_array_en_i_1_i;
-LOCATE UGROUP "Ref_ff_en" SITE "R8C144D" ;
+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;
-LOCATE UGROUP "FC_1" SITE "R10C119D" ;
-UGROUP "hit_1" 
+LOCATE UGROUP "FC_1" SITE "R10C131D" ;
+UGROUP "hit_1" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_1_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_1" SITE "R11C121D" ;
-UGROUP "ff_en_1"
+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_1_i;
-LOCATE UGROUP "ff_en_1" SITE "R10C144D" ;
+LOCATE UGROUP "ff_en_1" SITE "R10C156D" ;
 #
 UGROUP "FC_2" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_2_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_2" SITE "R21C119D" ;
-UGROUP "hit_2" 
+LOCATE UGROUP "FC_2" SITE "R21C131D" ;
+UGROUP "hit_2"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_2_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_2" SITE "R22C121D" ;
-UGROUP "ff_en_2"
+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;
-LOCATE UGROUP "ff_en_2" SITE "R21C144D" ;
+LOCATE UGROUP "ff_en_2" SITE "R21C156D" ;
 #
 UGROUP "FC_3" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_3_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_3" SITE "R23C119D" ;
-UGROUP "hit_3" 
+LOCATE UGROUP "FC_3" SITE "R23C131D" ;
+UGROUP "hit_3"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_3_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_3" SITE "R24C121D" ;
-UGROUP "ff_en_3"
+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;
-LOCATE UGROUP "ff_en_3" SITE "R23C144D" ;
+LOCATE UGROUP "ff_en_3" SITE "R23C156D" ;
 #
 UGROUP "FC_4" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_4_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_4" SITE "R30C131D" ;
-UGROUP "hit_4" 
+UGROUP "hit_4"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_4_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_4" SITE "R31C133D" ;
-UGROUP "ff_en_4"
+UGROUP "ff_en_4" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_4_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_4" SITE "R30C156D" ;
 #
 UGROUP "FC_5" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_5_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_5" SITE "R32C131D" ;
-UGROUP "hit_5" 
+UGROUP "hit_5"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_5_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_5" SITE "R33C133D" ;
-UGROUP "ff_en_5"
+UGROUP "ff_en_5" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_5_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_5" SITE "R32C156D" ;
 #
 UGROUP "FC_6" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_6_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_6" SITE "R35C131D" ;
-UGROUP "hit_6" 
+UGROUP "hit_6"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_6_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_6" SITE "R36C133D" ;
-UGROUP "ff_en_6"
+UGROUP "ff_en_6" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_6_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_6" SITE "R35C156D" ;
 #
 UGROUP "FC_7" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_7_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_7" SITE "R37C131D" ;
-UGROUP "hit_7" 
+UGROUP "hit_7"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_7_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_7" SITE "R38C133D" ;
-UGROUP "ff_en_7"
+UGROUP "ff_en_7" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_7_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_7" SITE "R37C156D" ;
 #
 UGROUP "FC_8" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_8_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_8" SITE "R48C131D" ;
-UGROUP "hit_8" 
+UGROUP "hit_8"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_8_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_8" SITE "R49C133D" ;
-UGROUP "ff_en_8"
+UGROUP "ff_en_8" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_8_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_8" SITE "R48C156D" ;
 #
 UGROUP "FC_9" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_9_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_9" SITE "R50C131D" ;
-UGROUP "hit_9" 
+UGROUP "hit_9"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_9_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_9" SITE "R51C133D" ;
-UGROUP "ff_en_9"
+UGROUP "ff_en_9" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_9_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_9" SITE "R50C156D" ;
 #
 UGROUP "FC_10" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_10_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_10" SITE "R53C131D" ;
-UGROUP "hit_10" 
+UGROUP "hit_10"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_10_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_10" SITE "R54C133D" ;
-UGROUP "ff_en_10"
+UGROUP "ff_en_10" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_10_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_10" SITE "R53C156D" ;
 #
 UGROUP "FC_11" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_11_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_11" SITE "R55C131D" ;
-UGROUP "hit_11"
+UGROUP "hit_11" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_11_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_11" SITE "R56C133D" ;
-UGROUP "ff_en_11"
+UGROUP "ff_en_11" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_11_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_11" SITE "R55C156D" ;
 #
 UGROUP "FC_12" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_12_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_12" SITE "R66C131D" ;
-UGROUP "hit_12" 
+UGROUP "hit_12"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_12_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_12" SITE "R67C133D" ;
-UGROUP "ff_en_12"
+UGROUP "ff_en_12" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_12_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_12" SITE "R66C156D" ;
 #
 UGROUP "FC_13" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_13_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_13" SITE "R68C131D" ;
-UGROUP "hit_13" 
+UGROUP "hit_13"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_13_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_13" SITE "R69C133D" ;
-UGROUP "ff_en_13"
+UGROUP "ff_en_13" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_13_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_13" SITE "R68C156D" ;
 #
 UGROUP "FC_14" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_14_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_14" SITE "R71C131D" ;
-UGROUP "hit_14" 
+UGROUP "hit_14"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_14_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_14" SITE "R72C133D" ;
-UGROUP "ff_en_14"
+UGROUP "ff_en_14" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_14_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_14" SITE "R71C156D" ;
 #
 UGROUP "FC_15" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_15_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_15" SITE "R73C131D" ;
-UGROUP "hit_15" 
+UGROUP "hit_15"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_15_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_15" SITE "R74C133D" ;
-UGROUP "ff_en_15"
+UGROUP "ff_en_15" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_15_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_15" SITE "R73C156D" ;
 #
 UGROUP "FC_16" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_16_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_16" SITE "R84C131D" ;
-UGROUP "hit_16" 
+UGROUP "hit_16"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_16_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_16" SITE "R85C133D" ;
-UGROUP "ff_en_16"
+UGROUP "ff_en_16" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_16_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_16" SITE "R84C156D" ;
 #
 UGROUP "FC_17" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_17_Channels/Channel_200_1/FC;
 LOCATE UGROUP "FC_17" SITE "R86C131D" ;
-UGROUP "hit_17" 
+UGROUP "hit_17"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_17_Channels/hit_buf_RNO;
 LOCATE UGROUP "hit_17" SITE "R87C133D" ;
-UGROUP "ff_en_17"
+UGROUP "ff_en_17" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_17_Channels/Channel_200_1/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_17" SITE "R86C156D" ;
 #
@@ -403,63 +432,63 @@ LOCATE UGROUP "ff_en_33" SITE "R50C78D" ;
 #
 UGROUP "FC_34" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_34_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_34" SITE "R53C53D" ;
+LOCATE UGROUP "FC_34" SITE "R89C53D" ;
 UGROUP "hit_34" 
        BLKNAME THE_TDC/GEN_Channels_34_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_34" SITE "R54C55D" ;
+LOCATE UGROUP "hit_34" SITE "R90C55D" ;
 UGROUP "ff_en_34"
        BLKNAME THE_TDC/GEN_Channels_34_Channels/Channel_200_1/ff_array_en_i_1_i;
-LOCATE UGROUP "ff_en_34" SITE "R53C78D" ;
+LOCATE UGROUP "ff_en_34" SITE "R89C78D" ;
 #
 UGROUP "FC_35" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_35_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_35" SITE "R55C53D" ;
+LOCATE UGROUP "FC_35" SITE "R91C53D" ;
 UGROUP "hit_35" 
        BLKNAME THE_TDC/GEN_Channels_35_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_35" SITE "R56C55D" ;
+LOCATE UGROUP "hit_35" SITE "R92C55D" ;
 UGROUP "ff_en_35"
        BLKNAME THE_TDC/GEN_Channels_35_Channels/Channel_200_1/ff_array_en_i_1_i;
-LOCATE UGROUP "ff_en_35" SITE "R55C78D" ;
+LOCATE UGROUP "ff_en_35" SITE "R91C78D" ;
 #
 UGROUP "FC_36" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_36_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_36" SITE "R66C53D" ;
+LOCATE UGROUP "FC_36" SITE "R102C53D" ;
 UGROUP "hit_36" 
        BLKNAME THE_TDC/GEN_Channels_36_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_36" SITE "R67C55D" ;
+LOCATE UGROUP "hit_36" SITE "R103C55D" ;
 UGROUP "ff_en_36"
        BLKNAME THE_TDC/GEN_Channels_36_Channels/Channel_200_1/ff_array_en_i_1_i;
-LOCATE UGROUP "ff_en_36" SITE "R66C78D" ;
+LOCATE UGROUP "ff_en_36" SITE "R102C78D" ;
 #
 UGROUP "FC_37" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_37_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_37" SITE "R68C53D" ;
+LOCATE UGROUP "FC_37" SITE "R104C53D" ;
 UGROUP "hit_37" 
        BLKNAME THE_TDC/GEN_Channels_37_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_37" SITE "R69C55D" ;
+LOCATE UGROUP "hit_37" SITE "R105C55D" ;
 UGROUP "ff_en_37"
        BLKNAME THE_TDC/GEN_Channels_37_Channels/Channel_200_1/ff_array_en_i_1_i;
-LOCATE UGROUP "ff_en_37" SITE "R68C78D" ;
+LOCATE UGROUP "ff_en_37" SITE "R104C78D" ;
 #
 UGROUP "FC_38" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_38_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_38" SITE "R71C53D" ;
+LOCATE UGROUP "FC_38" SITE "R111C53D" ;
 UGROUP "hit_38" 
        BLKNAME THE_TDC/GEN_Channels_38_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_38" SITE "R72C55D" ;
+LOCATE UGROUP "hit_38" SITE "R112C55D" ;
 UGROUP "ff_en_38"
        BLKNAME THE_TDC/GEN_Channels_38_Channels/Channel_200_1/ff_array_en_i_1_i;
-LOCATE UGROUP "ff_en_38" SITE "R71C78D" ;
+LOCATE UGROUP "ff_en_38" SITE "R111C78D" ;
 #
 UGROUP "FC_39" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_39_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_39" SITE "R73C53D" ;
+LOCATE UGROUP "FC_39" SITE "R113C53D" ;
 UGROUP "hit_39" 
        BLKNAME THE_TDC/GEN_Channels_39_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_39" SITE "R74C55D" ;
+LOCATE UGROUP "hit_39" SITE "R114C55D" ;
 UGROUP "ff_en_39"
        BLKNAME THE_TDC/GEN_Channels_39_Channels/Channel_200_1/ff_array_en_i_1_i;
-LOCATE UGROUP "ff_en_39" SITE "R73C78D" ;
+LOCATE UGROUP "ff_en_39" SITE "R113C78D" ;
 #
 UGROUP "FC_40" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_40_Channels/Channel_200_1/FC;
@@ -473,73 +502,73 @@ LOCATE UGROUP "ff_en_40" SITE "R84C78D" ;
 #
 UGROUP "FC_41" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_41_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_41" SITE "R86C53D" ;
+LOCATE UGROUP "FC_41" SITE "R86C2D" ;
 UGROUP "hit_41" 
        BLKNAME THE_TDC/GEN_Channels_41_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_41" SITE "R87C55D" ;
+LOCATE UGROUP "hit_41" SITE "R87C4D" ;
 UGROUP "ff_en_41"
        BLKNAME THE_TDC/GEN_Channels_41_Channels/Channel_200_1/ff_array_en_i_1_i;
-LOCATE UGROUP "ff_en_41" SITE "R86C78D" ;
+LOCATE UGROUP "ff_en_41" SITE "R86C27D" ;
 #
 UGROUP "FC_42" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_42_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_42" SITE "R89C53D" ;
+LOCATE UGROUP "FC_42" SITE "R89C2D" ;
 UGROUP "hit_42" 
        BLKNAME THE_TDC/GEN_Channels_42_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_42" SITE "R90C55D" ;
+LOCATE UGROUP "hit_42" SITE "R90C4D" ;
 UGROUP "ff_en_42"
        BLKNAME THE_TDC/GEN_Channels_42_Channels/Channel_200_1/ff_array_en_i_1_i;
-LOCATE UGROUP "ff_en_42" SITE "R89C78D" ;
+LOCATE UGROUP "ff_en_42" SITE "R89C27D" ;
 #
 UGROUP "FC_43" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_43_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_43" SITE "R91C53D" ;
+LOCATE UGROUP "FC_43" SITE "R91C2D" ;
 UGROUP "hit_43" 
        BLKNAME THE_TDC/GEN_Channels_43_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_43" SITE "R92C55D" ;
+LOCATE UGROUP "hit_43" SITE "R92C4D" ;
 UGROUP "ff_en_43"
        BLKNAME THE_TDC/GEN_Channels_43_Channels/Channel_200_1/ff_array_en_i_1_i;
-LOCATE UGROUP "ff_en_43" SITE "R91C78D" ;
+LOCATE UGROUP "ff_en_43" SITE "R91C27D" ;
 #
 UGROUP "FC_44" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_44_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_44" SITE "R102C53D" ;
+LOCATE UGROUP "FC_44" SITE "R102C2D" ;
 UGROUP "hit_44" 
        BLKNAME THE_TDC/GEN_Channels_44_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_44" SITE "R103C55D" ;
+LOCATE UGROUP "hit_44" SITE "R103C4D" ;
 UGROUP "ff_en_44"
        BLKNAME THE_TDC/GEN_Channels_44_Channels/Channel_200_1/ff_array_en_i_1_i;
-LOCATE UGROUP "ff_en_44" SITE "R102C78D" ;
+LOCATE UGROUP "ff_en_44" SITE "R102C27D" ;
 #
 UGROUP "FC_45" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_45_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_45" SITE "R104C53D" ;
+LOCATE UGROUP "FC_45" SITE "R104C2D" ;
 UGROUP "hit_45" 
        BLKNAME THE_TDC/GEN_Channels_45_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_45" SITE "R105C55D" ;
+LOCATE UGROUP "hit_45" SITE "R105C4D" ;
 UGROUP "ff_en_45"
        BLKNAME THE_TDC/GEN_Channels_45_Channels/Channel_200_1/ff_array_en_i_1_i;
-LOCATE UGROUP "ff_en_45" SITE "R104C78D" ;
+LOCATE UGROUP "ff_en_45" SITE "R104C27D" ;
 #
 UGROUP "FC_46" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_46_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_46" SITE "R111C53D" ;
+LOCATE UGROUP "FC_46" SITE "R111C2D" ;
 UGROUP "hit_46" 
        BLKNAME THE_TDC/GEN_Channels_46_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_46" SITE "R112C55D" ;
+LOCATE UGROUP "hit_46" SITE "R112C4D" ;
 UGROUP "ff_en_46"
        BLKNAME THE_TDC/GEN_Channels_46_Channels/Channel_200_1/ff_array_en_i_1_i;
-LOCATE UGROUP "ff_en_46" SITE "R111C78D" ;
+LOCATE UGROUP "ff_en_46" SITE "R111C27D" ;
 #
 UGROUP "FC_47" BBOX 1 51 
        BLKNAME THE_TDC/GEN_Channels_47_Channels/Channel_200_1/FC;
-LOCATE UGROUP "FC_47" SITE "R113C53D" ;
+LOCATE UGROUP "FC_47" SITE "R113C2D" ;
 UGROUP "hit_47" 
        BLKNAME THE_TDC/GEN_Channels_47_Channels/hit_buf_RNO;
-LOCATE UGROUP "hit_47" SITE "R114C55D" ;
+LOCATE UGROUP "hit_47" SITE "R114C4D" ;
 UGROUP "ff_en_47"
        BLKNAME THE_TDC/GEN_Channels_47_Channels/Channel_200_1/ff_array_en_i_1_i;
-LOCATE UGROUP "ff_en_47" SITE "R113C78D" ;
+LOCATE UGROUP "ff_en_47" SITE "R113C27D" ;
 #
 #
 #
@@ -718,16 +747,16 @@ LOCATE UGROUP "ff_en_64" SITE "R84C27D" ;
 ##############################################################################
 ##                          CHANNEL PLACEMENTS                             ##
 ##############################################################################
-UGROUP "E&F_ref" BBOX 5 21
-#      BLKNAME THE_TDC/The_Reference_Time/hit_detect_i
-#      BLKNAME THE_TDC/The_Reference_Time/hit_detect_reg
-#      BLKNAME THE_TDC/The_Reference_Time/Start_Encoder_un7_hit_detect_reg
-#      BLKNAME THE_TDC/The_Reference_Time/result_2_reg
-#      BLKNAME THE_TDC/The_Reference_Time/FIFO
+UGROUP "E&F_ref" BBOX 6 21
+       BLKNAME THE_TDC/The_Reference_Time/hit_detect_i
+       BLKNAME THE_TDC/The_Reference_Time/hit_detect_reg
+       BLKNAME THE_TDC/The_Reference_Time/Start_Encoder_un7_hit_detect_reg
+       BLKNAME THE_TDC/The_Reference_Time/result_2_reg
+       BLKNAME THE_TDC/The_Reference_Time/FIFO
        BLKNAME THE_TDC/The_Reference_Time/Encoder;
 # LOCATE UGROUP "E&F_ref" REGION "Region_E&F_1" ;
-LOCATE UGROUP "E&F_ref" SITE "R12C122D" ;
-UGROUP "E&F_1" BBOX 5 21
+LOCATE UGROUP "E&F_ref" SITE "R11C134D" ;
+UGROUP "E&F_1" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_1_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_1_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_1_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -735,8 +764,8 @@ UGROUP "E&F_1" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_1_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_1_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_1" REGION "Region_E&F_1" ;
-LOCATE UGROUP "E&F_1" SITE "R12C143D" ;
-UGROUP "E&F_2" BBOX 5 21
+LOCATE UGROUP "E&F_1" SITE "R11C155D" ;
+UGROUP "E&F_2" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_2_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_2_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_2_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -744,8 +773,8 @@ UGROUP "E&F_2" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_2_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_2_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_2" REGION "Region_E&F_1" ;
-LOCATE UGROUP "E&F_2" SITE "R15C122D" ;
-UGROUP "E&F_3" BBOX 5 21
+LOCATE UGROUP "E&F_2" SITE "R15C134D" ;
+UGROUP "E&F_3" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_3_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_3_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_3_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -753,8 +782,8 @@ UGROUP "E&F_3" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_3_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_3_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_3" REGION "Region_E&F_1" ;
-LOCATE UGROUP "E&F_3" SITE "R15C143D" ;
-UGROUP "E&F_4" BBOX 5 21
+LOCATE UGROUP "E&F_3" SITE "R15C155D" ;
+UGROUP "E&F_4" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_4_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_4_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_4_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -763,7 +792,7 @@ UGROUP "E&F_4" BBOX 5 21
        BLKNAME THE_TDC/GEN_Channels_4_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_4" REGION "Region_E&F_2" ;
 LOCATE UGROUP "E&F_4" SITE "R24C134D" ;
-UGROUP "E&F_5" BBOX 5 21
+UGROUP "E&F_5" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_5_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_5_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_5_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -772,7 +801,7 @@ UGROUP "E&F_5" BBOX 5 21
        BLKNAME THE_TDC/GEN_Channels_5_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_5" REGION "Region_E&F_2" ;
 LOCATE UGROUP "E&F_5" SITE "R24C155D" ;
-UGROUP "E&F_6" BBOX 5 21
+UGROUP "E&F_6" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_6_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_6_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_6_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -780,8 +809,8 @@ UGROUP "E&F_6" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_6_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_6_Channels/Channel_200_1;
 # # LOCATE UGROUP "E&F_6" REGION "Region_E&F_3" ;
-LOCATE UGROUP "E&F_6" SITE "R39C134D" ;
-UGROUP "E&F_7" BBOX 5 21
+LOCATE UGROUP "E&F_6" SITE "R38C134D" ;
+UGROUP "E&F_7" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_7_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_7_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_7_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -789,8 +818,8 @@ UGROUP "E&F_7" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_7_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_7_Channels/Channel_200_1;
 # # LOCATE UGROUP "E&F_7" REGION "Region_E&F_3" ;
-LOCATE UGROUP "E&F_7" SITE "R39C155D" ;
-UGROUP "E&F_8" BBOX 5 21
+LOCATE UGROUP "E&F_7" SITE "R38C155D" ;
+UGROUP "E&F_8" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_8_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_8_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_8_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -799,7 +828,7 @@ UGROUP "E&F_8" BBOX 5 21
        BLKNAME THE_TDC/GEN_Channels_8_Channels/Channel_200_1;
 # # LOCATE UGROUP "E&F_8" REGION "Region_E&F_3" ;
 LOCATE UGROUP "E&F_8" SITE "R42C134D" ;
-UGROUP "E&F_9" BBOX 5 21
+UGROUP "E&F_9" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_9_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_9_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_9_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -808,7 +837,7 @@ UGROUP "E&F_9" BBOX 5 21
        BLKNAME THE_TDC/GEN_Channels_9_Channels/Channel_200_1;
 # # LOCATE UGROUP "E&F_9" REGION "Region_E&F_3" ;
 LOCATE UGROUP "E&F_9" SITE "R42C155D" ;
-UGROUP "E&F_10" BBOX 5 21
+UGROUP "E&F_10" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_10_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_10_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_10_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -816,8 +845,8 @@ UGROUP "E&F_10" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_10_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_10_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_10" REGION "Region_E&F_4" ;
-LOCATE UGROUP "E&F_10" SITE "R57C134D" ;
-UGROUP "E&F_11" BBOX 5 21
+LOCATE UGROUP "E&F_10" SITE "R56C134D" ;
+UGROUP "E&F_11" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_11_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_11_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_11_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -825,8 +854,8 @@ UGROUP "E&F_11" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_11_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_11_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_11" REGION "Region_E&F_4" ;
-LOCATE UGROUP "E&F_11" SITE "R57C155D" ;
-UGROUP "E&F_12" BBOX 5 21
+LOCATE UGROUP "E&F_11" SITE "R56C155D" ;
+UGROUP "E&F_12" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_12_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_12_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_12_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -835,7 +864,7 @@ UGROUP "E&F_12" BBOX 5 21
        BLKNAME THE_TDC/GEN_Channels_12_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_12" REGION "Region_E&F_4" ;
 LOCATE UGROUP "E&F_12" SITE "R60C134D" ;
-UGROUP "E&F_13" BBOX 5 21
+UGROUP "E&F_13" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_13_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_13_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_13_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -844,7 +873,7 @@ UGROUP "E&F_13" BBOX 5 21
        BLKNAME THE_TDC/GEN_Channels_13_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_13" REGION "Region_E&F_4" ;
 LOCATE UGROUP "E&F_13" SITE "R60C155D" ;
-UGROUP "E&F_14" BBOX 5 21
+UGROUP "E&F_14" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_14_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_14_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_14_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -852,8 +881,8 @@ UGROUP "E&F_14" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_14_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_14_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_14" REGION "Region_E&F_5" ;
-LOCATE UGROUP "E&F_14" SITE "R75C134D" ;
-UGROUP "E&F_15" BBOX 5 21
+LOCATE UGROUP "E&F_14" SITE "R74C134D" ;
+UGROUP "E&F_15" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_15_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_15_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_15_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -861,8 +890,8 @@ UGROUP "E&F_15" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_15_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_15_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_15" REGION "Region_E&F_5" ;
-LOCATE UGROUP "E&F_15" SITE "R75C155D" ;
-UGROUP "E&F_16" BBOX 5 21
+LOCATE UGROUP "E&F_15" SITE "R74C155D" ;
+UGROUP "E&F_16" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_16_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_16_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_16_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -871,7 +900,7 @@ UGROUP "E&F_16" BBOX 5 21
        BLKNAME THE_TDC/GEN_Channels_16_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_16" REGION "Region_E&F_5" ;
 LOCATE UGROUP "E&F_16" SITE "R78C134D" ;
-UGROUP "E&F_17" BBOX 5 21
+UGROUP "E&F_17" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_17_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_17_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_17_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -880,7 +909,7 @@ UGROUP "E&F_17" BBOX 5 21
        BLKNAME THE_TDC/GEN_Channels_17_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_17" REGION "Region_E&F_5" ;
 LOCATE UGROUP "E&F_17" SITE "R78C155D" ;
-UGROUP "E&F_18" BBOX 5 21
+UGROUP "E&F_18" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_18_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_18_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_18_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -888,8 +917,8 @@ UGROUP "E&F_18" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_18_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_18_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_18" REGION "Region_E&F_6" ;
-LOCATE UGROUP "E&F_18" SITE "R93C134D" ;
-UGROUP "E&F_19" BBOX 5 21
+LOCATE UGROUP "E&F_18" SITE "R92C134D" ;
+UGROUP "E&F_19" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_19_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_19_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_19_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -897,8 +926,8 @@ UGROUP "E&F_19" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_19_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_19_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_19" REGION "Region_E&F_6" ;
-LOCATE UGROUP "E&F_19" SITE "R93C155D" ;
-UGROUP "E&F_20" BBOX 5 21
+LOCATE UGROUP "E&F_19" SITE "R92C155D" ;
+UGROUP "E&F_20" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_20_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_20_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_20_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -907,7 +936,7 @@ UGROUP "E&F_20" BBOX 5 21
        BLKNAME THE_TDC/GEN_Channels_20_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_20" REGION "Region_E&F_6" ;
 LOCATE UGROUP "E&F_20" SITE "R96C134D" ;
-UGROUP "E&F_21" BBOX 5 21
+UGROUP "E&F_21" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_21_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_21_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_21_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -916,7 +945,7 @@ UGROUP "E&F_21" BBOX 5 21
        BLKNAME THE_TDC/GEN_Channels_21_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_21" REGION "Region_E&F_6" ;
 LOCATE UGROUP "E&F_21" SITE "R96C155D" ;
-UGROUP "E&F_22" BBOX 5 21
+UGROUP "E&F_22" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_22_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_22_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_22_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -925,7 +954,7 @@ UGROUP "E&F_22" BBOX 5 21
        BLKNAME THE_TDC/GEN_Channels_22_Channels/Channel_200_1;
 # LOCATE UGROUP "E&F_22" REGION "Region_E&F_7" ;
 LOCATE UGROUP "E&F_22" SITE "R105C134D" ;
-UGROUP "E&F_23" BBOX 5 21
+UGROUP "E&F_23" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_23_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_23_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_23_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -937,7 +966,7 @@ LOCATE UGROUP "E&F_23" SITE "R105C155D" ;
 #
 #
 #
-UGROUP "E&F_24" BBOX 5 21
+UGROUP "E&F_24" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_24_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_24_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_24_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -945,8 +974,8 @@ UGROUP "E&F_24" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_24_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_24_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_24_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_24" SITE "R12C57D" ;
-UGROUP "E&F_25" BBOX 5 21
+LOCATE UGROUP "E&F_24" SITE "R11C57D" ;
+UGROUP "E&F_25" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_25_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_25_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_25_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -954,8 +983,8 @@ UGROUP "E&F_25" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_25_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_25_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_25_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_25" SITE "R12C78D" ;
-UGROUP "E&F_26" BBOX 5 21
+LOCATE UGROUP "E&F_25" SITE "R11C78D" ;
+UGROUP "E&F_26" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_26_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_26_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_26_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -964,7 +993,7 @@ UGROUP "E&F_26" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_26_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_26_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_26" SITE "R15C57D" ;
-UGROUP "E&F_27" BBOX 5 21
+UGROUP "E&F_27" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_27_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_27_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_27_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -973,7 +1002,7 @@ UGROUP "E&F_27" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_27_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_27_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_27" SITE "R15C78D" ;
-UGROUP "E&F_28" BBOX 5 21
+UGROUP "E&F_28" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_28_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_28_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_28_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -982,7 +1011,7 @@ UGROUP "E&F_28" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_28_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_28_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_28" SITE "R24C57D" ;
-UGROUP "E&F_29" BBOX 5 21
+UGROUP "E&F_29" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_29_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_29_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_29_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -991,7 +1020,7 @@ UGROUP "E&F_29" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_29_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_29_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_29" SITE "R24C78D" ;
-UGROUP "E&F_30" BBOX 5 21
+UGROUP "E&F_30" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_30_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_30_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_30_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -999,8 +1028,8 @@ UGROUP "E&F_30" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_30_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_30_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_30_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_30" SITE "R39C57D" ;
-UGROUP "E&F_31" BBOX 5 21
+LOCATE UGROUP "E&F_30" SITE "R38C57D" ;
+UGROUP "E&F_31" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_31_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_31_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_31_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -1008,8 +1037,8 @@ UGROUP "E&F_31" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_31_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_31_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_31_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_31" SITE "R39C78D" ;
-UGROUP "E&F_32" BBOX 5 21
+LOCATE UGROUP "E&F_31" SITE "R38C78D" ;
+UGROUP "E&F_32" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_32_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_32_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_32_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -1018,7 +1047,7 @@ UGROUP "E&F_32" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_32_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_32_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_32" SITE "R42C57D" ;
-UGROUP "E&F_33" BBOX 5 21
+UGROUP "E&F_33" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_33_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_33_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_33_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -1027,7 +1056,7 @@ UGROUP "E&F_33" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_33_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_33_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_33" SITE "R42C78D" ;
-UGROUP "E&F_34" BBOX 5 21
+UGROUP "E&F_34" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_34_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_34_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_34_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -1035,8 +1064,8 @@ UGROUP "E&F_34" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_34_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_34_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_34_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_34" SITE "R57C57D" ;
-UGROUP "E&F_35" BBOX 5 21
+LOCATE UGROUP "E&F_34" SITE "R92C57D" ;
+UGROUP "E&F_35" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_35_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_35_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_35_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1044,8 +1073,8 @@ UGROUP "E&F_35" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_35_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_35_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_35_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_35" SITE "R57C78D" ;
-UGROUP "E&F_36" BBOX 5 21
+LOCATE UGROUP "E&F_35" SITE "R92C78D" ;
+UGROUP "E&F_36" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_36_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_36_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_36_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1053,8 +1082,8 @@ UGROUP "E&F_36" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_36_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_36_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_36_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_36" SITE "R60C57D" ;
-UGROUP "E&F_37" BBOX 5 21
+LOCATE UGROUP "E&F_36" SITE "R96C57D" ;
+UGROUP "E&F_37" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_37_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_37_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_37_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1062,8 +1091,8 @@ UGROUP "E&F_37" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_37_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_37_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_37_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_37" SITE "R60C78D" ;
-UGROUP "E&F_38" BBOX 5 21
+LOCATE UGROUP "E&F_37" SITE "R96C78D" ;
+UGROUP "E&F_38" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_38_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_38_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_38_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1071,8 +1100,8 @@ UGROUP "E&F_38" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_38_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_38_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_38_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_38" SITE "R75C57D" ;
-UGROUP "E&F_39" BBOX 5 21
+LOCATE UGROUP "E&F_38" SITE "R105C57D" ;
+UGROUP "E&F_39" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_39_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_39_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_39_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1080,8 +1109,8 @@ UGROUP "E&F_39" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_39_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_39_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_39_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_39" SITE "R75C78D" ;
-UGROUP "E&F_40" BBOX 5 21
+LOCATE UGROUP "E&F_39" SITE "R105C78D" ;
+UGROUP "E&F_40" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_40_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_40_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_40_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1090,7 +1119,7 @@ UGROUP "E&F_40" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_40_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_40_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_40" SITE "R78C57D" ;
-UGROUP "E&F_41" BBOX 5 21
+UGROUP "E&F_41" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_41_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_41_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_41_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1098,8 +1127,8 @@ UGROUP "E&F_41" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_41_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_41_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_41_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_41" SITE "R78C78D" ;
-UGROUP "E&F_42" BBOX 5 21
+LOCATE UGROUP "E&F_41" SITE "R78C29D" ;
+UGROUP "E&F_42" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_42_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_42_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_42_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1107,8 +1136,8 @@ UGROUP "E&F_42" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_42_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_42_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_42_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_42" SITE "R93C57D" ;
-UGROUP "E&F_43" BBOX 5 21
+LOCATE UGROUP "E&F_42" SITE "R92C8D" ;
+UGROUP "E&F_43" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_43_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_43_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_43_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1116,8 +1145,8 @@ UGROUP "E&F_43" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_43_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_43_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_43_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_43" SITE "R93C78D" ;
-UGROUP "E&F_44" BBOX 5 21
+LOCATE UGROUP "E&F_43" SITE "R92C29D" ;
+UGROUP "E&F_44" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_44_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_44_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_44_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1125,8 +1154,8 @@ UGROUP "E&F_44" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_44_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_44_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_44_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_44" SITE "R96C57D" ;
-UGROUP "E&F_45" BBOX 5 21
+LOCATE UGROUP "E&F_44" SITE "R96C8D" ;
+UGROUP "E&F_45" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_45_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_45_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_45_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1134,8 +1163,8 @@ UGROUP "E&F_45" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_45_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_45_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_45_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_45" SITE "R96C78D" ;
-UGROUP "E&F_46" BBOX 5 21
+LOCATE UGROUP "E&F_45" SITE "R96C29D" ;
+UGROUP "E&F_46" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_46_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_46_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_46_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1143,8 +1172,8 @@ UGROUP "E&F_46" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_46_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_46_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_46_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_46" SITE "R105C57D" ;
-UGROUP "E&F_47" BBOX 5 21
+LOCATE UGROUP "E&F_46" SITE "R105C8D" ;
+UGROUP "E&F_47" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_47_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_47_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_47_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1152,11 +1181,11 @@ UGROUP "E&F_47" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_47_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_47_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_47_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_47" SITE "R105C78D" ;
+LOCATE UGROUP "E&F_47" SITE "R105C29D" ;
 #
 #
 #
-UGROUP "E&F_48" BBOX 5 21
+UGROUP "E&F_48" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_48_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_48_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_48_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1164,8 +1193,8 @@ UGROUP "E&F_48" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_48_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_48_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_48_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_48" SITE "R12C8D" ;
-UGROUP "E&F_49" BBOX 5 21
+LOCATE UGROUP "E&F_48" SITE "R11C8D" ;
+UGROUP "E&F_49" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_49_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_49_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_49_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1173,8 +1202,8 @@ UGROUP "E&F_49" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_49_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_49_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_49_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_49" SITE "R12C29D" ;
-UGROUP "E&F_50" BBOX 5 21
+LOCATE UGROUP "E&F_49" SITE "R11C29D" ;
+UGROUP "E&F_50" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_50_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_50_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_50_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1183,7 +1212,7 @@ UGROUP "E&F_50" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_50_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_50_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_50" SITE "R15C8D" ;
-UGROUP "E&F_51" BBOX 5 21
+UGROUP "E&F_51" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_51_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_51_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_51_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1192,7 +1221,7 @@ UGROUP "E&F_51" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_51_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_51_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_51" SITE "R15C29D" ;
-UGROUP "E&F_52" BBOX 5 21
+UGROUP "E&F_52" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_52_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_52_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_52_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1201,7 +1230,7 @@ UGROUP "E&F_52" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_52_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_52_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_52" SITE "R24C8D" ;
-UGROUP "E&F_53" BBOX 5 21
+UGROUP "E&F_53" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_53_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_53_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_53_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1210,7 +1239,7 @@ UGROUP "E&F_53" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_53_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_53_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_53" SITE "R24C29D" ;
-UGROUP "E&F_54" BBOX 5 21
+UGROUP "E&F_54" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_54_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_54_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_54_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1218,8 +1247,8 @@ UGROUP "E&F_54" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_54_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_54_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_54_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_54" SITE "R39C8D" ;
-UGROUP "E&F_55" BBOX 5 21
+LOCATE UGROUP "E&F_54" SITE "R38C8D" ;
+UGROUP "E&F_55" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_55_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_55_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_55_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1227,8 +1256,8 @@ UGROUP "E&F_55" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_55_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_55_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_55_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_55" SITE "R39C29D" ;
-UGROUP "E&F_56" BBOX 5 21
+LOCATE UGROUP "E&F_55" SITE "R38C29D" ;
+UGROUP "E&F_56" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_56_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_56_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_56_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1237,7 +1266,7 @@ UGROUP "E&F_56" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_56_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_56_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_56" SITE "R42C8D" ;
-UGROUP "E&F_57" BBOX 5 21
+UGROUP "E&F_57" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_57_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_57_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_57_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1246,7 +1275,7 @@ UGROUP "E&F_57" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_57_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_57_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_57" SITE "R42C29D" ;
-UGROUP "E&F_58" BBOX 5 21
+UGROUP "E&F_58" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_58_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_58_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_58_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1254,8 +1283,8 @@ UGROUP "E&F_58" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_58_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_58_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_58_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_58" SITE "R57C8D" ;
-UGROUP "E&F_59" BBOX 5 21
+LOCATE UGROUP "E&F_58" SITE "R56C8D" ;
+UGROUP "E&F_59" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_59_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_59_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_59_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1263,8 +1292,8 @@ UGROUP "E&F_59" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_59_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_59_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_59_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_59" SITE "R57C29D" ;
-UGROUP "E&F_60" BBOX 5 21
+LOCATE UGROUP "E&F_59" SITE "R56C29D" ;
+UGROUP "E&F_60" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_60_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_60_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_60_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1273,7 +1302,7 @@ UGROUP "E&F_60" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_60_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_60_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_60" SITE "R60C8D" ;
-UGROUP "E&F_61" BBOX 5 21
+UGROUP "E&F_61" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_61_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_61_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_61_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1282,7 +1311,7 @@ UGROUP "E&F_61" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_61_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_61_Channels/Channel_200_1;
 LOCATE UGROUP "E&F_61" SITE "R60C29D" ;
-UGROUP "E&F_62" BBOX 5 21
+UGROUP "E&F_62" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_62_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_62_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_62_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1290,8 +1319,8 @@ UGROUP "E&F_62" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_62_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_62_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_62_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_62" SITE "R75C8D" ;
-UGROUP "E&F_63" BBOX 5 21
+LOCATE UGROUP "E&F_62" SITE "R74C8D" ;
+UGROUP "E&F_63" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_63_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_63_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_63_Channels/Start_Encoder_un7_hit_detect_regdupdup
@@ -1299,8 +1328,8 @@ UGROUP "E&F_63" BBOX 5 21
 #      BLKNAME THE_TDC/GEN_Channels_63_Channels/result_2_reg
 #      BLKNAME THE_TDC/GEN_Channels_63_Channels/FIFO
        BLKNAME THE_TDC/GEN_Channels_63_Channels/Channel_200_1;
-LOCATE UGROUP "E&F_63" SITE "R75C29D" ;
-UGROUP "E&F_64" BBOX 5 21
+LOCATE UGROUP "E&F_63" SITE "R74C29D" ;
+UGROUP "E&F_64" BBOX 6 21
 #      BLKNAME THE_TDC/GEN_Channels_64_Channels/hit_detect_i
 #      BLKNAME THE_TDC/GEN_Channels_64_Channels/hit_detect_reg
 #      BLKNAME THE_TDC/GEN_Channels_64_Channels/Start_Encoder_un7_hit_detect_regdup
@@ -1324,13 +1353,15 @@ MULTICYCLE TO CELL "THE_TDC/GEN_Channels_*_Channels/fifo_wr_cntr_*" 3.000000 X ;
 # MULTICYCLE FROM CELL "THE_TDC/reset_tdc*" 3.000000 X ;
 BLOCK NET "THE_TDC/reset_tdc*" ;
 
-MULTICYCLE TO   CELL "THE_TDC/GEN_Channels_*_Channels/hit_time_stamp_i_*" 2.000000 X ;
-MULTICYCLE TO   CELL "THE_TDC/The_Reference_Time/hit_time_stamp_i_*" 2.000000 X ;
+#MULTICYCLE TO   CELL "THE_TDC/GEN_Channels_*_Channels/hit_time_stamp_i_*" 2.000000 X ;
+#MULTICYCLE TO   CELL "THE_TDC/The_Reference_Time/hit_time_stamp_i_*" 2.000000 X ;
 
-MULTICYCLE FROM CELL "THE_TDC/GEN_Channels_*_Channels/FIFO_FULL_OUT" 2.000000 X ;
-MULTICYCLE FROM CELL "THE_TDC/GEN_Channels_*_Channels/FIFO_ALMOST_FULL_OUT" 2.000000 X ;
+MULTICYCLE FROM CELL "THE_TDC/GEN_Channels_*_Channels/Channel_200_1/FIFO_FULL_OUT" 2.000000 X ;
+MULTICYCLE FROM CELL "THE_TDC/GEN_Channels_*_Channels/Channel_200_1/FIFO_ALMOST_FULL_OUT" 2.000000 X ;
 
 
-#MAXDELAY NET "THE_TDC/The_Reference_Time/hit_buf" 0.700000 nS DATAPATH_ONLY ;
-MAXDELAY NET "TRIGGER_LEFT_c_i" 0.700000 nS DATAPATH_ONLY ;
+MAXDELAY NET "THE_TDC/The_Reference_Time/hit_buf" 0.700000 nS DATAPATH_ONLY ;
 MAXDELAY NET "THE_TDC/GEN_Channels_*_Channels/hit_buf" 0.700000 nS DATAPATH_ONLY ;
+
+#Jan: This guy gave timing errors > 7ns, so I removed it for my test
+#MAXDELAY NET "TRIGGER_LEFT_c_i" 0.700000 nS DATAPATH_ONLY ;