new constraints for no unconnected paths

diff --git a/tdc_releases/tdc_v1.6/tdc_constraints_64.lpf b/tdc_releases/tdc_v1.6/tdc_constraints_64.lpf
index 005783119a990b819e6eeee46af35e9739ecbb0c..b08d872f1d2fcf35b860dac099b6a5bd9b8882bb 100644 (file)
--- a/tdc_releases/tdc_v1.6/tdc_constraints_64.lpf
+++ b/tdc_releases/tdc_v1.6/tdc_constraints_64.lpf
@@ -7,9 +7,9 @@
 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;
-LOCATE UGROUP "ref_hit" SITE "R9C133D" ;
+UGROUP "hitBuf_ref" BBOX 1 1
+       BLKNAME THE_TDC/hit_mux_ref;
+LOCATE UGROUP "hitBuf_ref" SITE "R9C133D" ;
 UGROUP "Ref_ff_en"  BBOX 1 1
        BLKNAME THE_TDC/ReferenceChannel/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "Ref_ff_en" SITE "R8C156D" ;
@@ -20,9 +20,9 @@ LOCATE UGROUP "Ref_ff_en" SITE "R8C156D" ;
 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;
-LOCATE UGROUP "hit_1" SITE "R11C133D" ;
+UGROUP "hitBuf_1" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_1_hit_mux_ch;
+LOCATE UGROUP "hitBuf_1" SITE "R11C133D" ;
 UGROUP "ff_en_1"  BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_1_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_1" SITE "R10C156D" ;
@@ -30,9 +30,9 @@ LOCATE UGROUP "ff_en_1" SITE "R10C156D" ;
 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;
-LOCATE UGROUP "hit_2" SITE "R22C133D" ;
+UGROUP "hitBuf_2"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_2_hit_mux_ch;
+LOCATE UGROUP "hitBuf_2" SITE "R22C133D" ;
 UGROUP "ff_en_2" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_2_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_2" SITE "R21C156D" ;
@@ -40,9 +40,9 @@ LOCATE UGROUP "ff_en_2" SITE "R21C156D" ;
 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;
-LOCATE UGROUP "hit_3" SITE "R24C133D" ;
+UGROUP "hitBuf_3"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_3_hit_mux_ch;
+LOCATE UGROUP "hitBuf_3" SITE "R24C133D" ;
 UGROUP "ff_en_3" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_3_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_3" SITE "R23C156D" ;
@@ -50,9 +50,9 @@ LOCATE UGROUP "ff_en_3" SITE "R23C156D" ;
 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;
-LOCATE UGROUP "hit_4" SITE "R31C133D" ;
+UGROUP "hitBuf_4"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_4_hit_mux_ch;
+LOCATE UGROUP "hitBuf_4" SITE "R31C133D" ;
 UGROUP "ff_en_4" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_4_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_4" SITE "R30C156D" ;
@@ -60,9 +60,9 @@ LOCATE UGROUP "ff_en_4" SITE "R30C156D" ;
 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;
-LOCATE UGROUP "hit_5" SITE "R33C133D" ;
+UGROUP "hitBuf_5"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_5_hit_mux_ch;
+LOCATE UGROUP "hitBuf_5" SITE "R33C133D" ;
 UGROUP "ff_en_5" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_5_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_5" SITE "R32C156D" ;
@@ -70,9 +70,9 @@ LOCATE UGROUP "ff_en_5" SITE "R32C156D" ;
 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;
-LOCATE UGROUP "hit_6" SITE "R36C133D" ;
+UGROUP "hitBuf_6"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_6_hit_mux_ch;
+LOCATE UGROUP "hitBuf_6" SITE "R36C133D" ;
 UGROUP "ff_en_6" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_6_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_6" SITE "R35C156D" ;
@@ -80,9 +80,9 @@ LOCATE UGROUP "ff_en_6" SITE "R35C156D" ;
 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;
-LOCATE UGROUP "hit_7" SITE "R38C133D" ;
+UGROUP "hitBuf_7"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_7_hit_mux_ch;
+LOCATE UGROUP "hitBuf_7" SITE "R38C133D" ;
 UGROUP "ff_en_7" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_7_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_7" SITE "R37C156D" ;
@@ -90,9 +90,9 @@ LOCATE UGROUP "ff_en_7" SITE "R37C156D" ;
 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;
-LOCATE UGROUP "hit_8" SITE "R49C133D" ;
+UGROUP "hitBuf_8"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_8_hit_mux_ch;
+LOCATE UGROUP "hitBuf_8" SITE "R49C133D" ;
 UGROUP "ff_en_8" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_8_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_8" SITE "R48C156D" ;
@@ -100,9 +100,9 @@ LOCATE UGROUP "ff_en_8" SITE "R48C156D" ;
 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;
-LOCATE UGROUP "hit_9" SITE "R51C133D" ;
+UGROUP "hitBuf_9"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_9_hit_mux_ch;
+LOCATE UGROUP "hitBuf_9" SITE "R51C133D" ;
 UGROUP "ff_en_9" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_9_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_9" SITE "R50C156D" ;
@@ -110,9 +110,9 @@ LOCATE UGROUP "ff_en_9" SITE "R50C156D" ;
 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;
-LOCATE UGROUP "hit_10" SITE "R54C133D" ;
+UGROUP "hitBuf_10"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_10_hit_mux_ch;
+LOCATE UGROUP "hitBuf_10" SITE "R54C133D" ;
 UGROUP "ff_en_10" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_10_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_10" SITE "R53C156D" ;
@@ -120,9 +120,9 @@ LOCATE UGROUP "ff_en_10" SITE "R53C156D" ;
 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;
-LOCATE UGROUP "hit_11" SITE "R56C133D" ;
+UGROUP "hitBuf_11" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_11_hit_mux_ch;
+LOCATE UGROUP "hitBuf_11" SITE "R56C133D" ;
 UGROUP "ff_en_11" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_11_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_11" SITE "R55C156D" ;
@@ -130,9 +130,9 @@ LOCATE UGROUP "ff_en_11" SITE "R55C156D" ;
 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;
-LOCATE UGROUP "hit_12" SITE "R11C60D" ;
+UGROUP "hitBuf_12" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_12_hit_mux_ch;
+LOCATE UGROUP "hitBuf_12" SITE "R11C60D" ;
 UGROUP "ff_en_12" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_12_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_12" SITE "R10C83D" ;
@@ -140,9 +140,9 @@ LOCATE UGROUP "ff_en_12" SITE "R10C83D" ;
 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;
-LOCATE UGROUP "hit_13" SITE "R24C60D" ;
+UGROUP "hitBuf_13" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_13_hit_mux_ch;
+LOCATE UGROUP "hitBuf_13" SITE "R24C60D" ;
 UGROUP "ff_en_13" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_13_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_13" SITE "R23C83D" ;
@@ -150,9 +150,9 @@ LOCATE UGROUP "ff_en_13" SITE "R23C83D" ;
 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;
-LOCATE UGROUP "hit_14" SITE "R33C60D" ;
+UGROUP "hitBuf_14" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_14_hit_mux_ch;
+LOCATE UGROUP "hitBuf_14" SITE "R33C60D" ;
 UGROUP "ff_en_14" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_14_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_14" SITE "R32C83D" ;
@@ -160,9 +160,9 @@ LOCATE UGROUP "ff_en_14" SITE "R32C83D" ;
 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;
-LOCATE UGROUP "hit_15" SITE "R38C60D" ;
+UGROUP "hitBuf_15" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_15_hit_mux_ch;
+LOCATE UGROUP "hitBuf_15" SITE "R38C60D" ;
 UGROUP "ff_en_15" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_15_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_15" SITE "R37C83D" ;
@@ -170,9 +170,9 @@ LOCATE UGROUP "ff_en_15" SITE "R37C83D" ;
 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;
-LOCATE UGROUP "hit_16" SITE "R51C60D" ;
+UGROUP "hitBuf_16" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_16_hit_mux_ch;
+LOCATE UGROUP "hitBuf_16" SITE "R51C60D" ;
 UGROUP "ff_en_16" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_16_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_16" SITE "R50C83D" ;
@@ -180,9 +180,9 @@ LOCATE UGROUP "ff_en_16" SITE "R50C83D" ;
 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;
-LOCATE UGROUP "hit_17" SITE "R67C133D" ;
+UGROUP "hitBuf_17"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_17_hit_mux_ch;
+LOCATE UGROUP "hitBuf_17" SITE "R67C133D" ;
 UGROUP "ff_en_17" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_17_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_17" SITE "R66C156D" ;
@@ -190,9 +190,9 @@ LOCATE UGROUP "ff_en_17" SITE "R66C156D" ;
 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;
-LOCATE UGROUP "hit_18" SITE "R69C133D" ;
+UGROUP "hitBuf_18"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_18_hit_mux_ch;
+LOCATE UGROUP "hitBuf_18" SITE "R69C133D" ;
 UGROUP "ff_en_18" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_18_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_18" SITE "R68C156D" ;
@@ -200,9 +200,9 @@ LOCATE UGROUP "ff_en_18" SITE "R68C156D" ;
 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;
-LOCATE UGROUP "hit_19" SITE "R72C133D" ;
+UGROUP "hitBuf_19"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_19_hit_mux_ch;
+LOCATE UGROUP "hitBuf_19" SITE "R72C133D" ;
 UGROUP "ff_en_19" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_19_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_19" SITE "R71C156D" ;
@@ -210,9 +210,9 @@ LOCATE UGROUP "ff_en_19" SITE "R71C156D" ;
 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;
-LOCATE UGROUP "hit_20" SITE "R74C133D" ;
+UGROUP "hitBuf_20"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_20_hit_mux_ch;
+LOCATE UGROUP "hitBuf_20" SITE "R74C133D" ;
 UGROUP "ff_en_20" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_20_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_20" SITE "R73C156D" ;
@@ -220,9 +220,9 @@ LOCATE UGROUP "ff_en_20" SITE "R73C156D" ;
 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;
-LOCATE UGROUP "hit_21" SITE "R85C133D" ;
+UGROUP "hitBuf_21"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_21_hit_mux_ch;
+LOCATE UGROUP "hitBuf_21" SITE "R85C133D" ;
 UGROUP "ff_en_21" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_21_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_21" SITE "R84C156D" ;
@@ -230,9 +230,9 @@ LOCATE UGROUP "ff_en_21" SITE "R84C156D" ;
 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;
-LOCATE UGROUP "hit_22" SITE "R87C133D" ;
+UGROUP "hitBuf_22"  BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_22_hit_mux_ch;
+LOCATE UGROUP "hitBuf_22" SITE "R87C133D" ;
 UGROUP "ff_en_22" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_22_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_22" SITE "R86C156D" ;
@@ -240,9 +240,9 @@ LOCATE UGROUP "ff_en_22" SITE "R86C156D" ;
 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;
-LOCATE UGROUP "hit_23" SITE "R90C133D" ;
+UGROUP "hitBuf_23" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_23_hit_mux_ch;
+LOCATE UGROUP "hitBuf_23" SITE "R90C133D" ;
 UGROUP "ff_en_23" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_23_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_23" SITE "R89C156D" ;
@@ -250,9 +250,9 @@ LOCATE UGROUP "ff_en_23" SITE "R89C156D" ;
 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;
-LOCATE UGROUP "hit_24" SITE "R92C133D" ;
+UGROUP "hitBuf_24" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_24_hit_mux_ch;
+LOCATE UGROUP "hitBuf_24" SITE "R92C133D" ;
 UGROUP "ff_en_24" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_24_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_24" SITE "R91C156D" ;
@@ -260,9 +260,9 @@ LOCATE UGROUP "ff_en_24" SITE "R91C156D" ;
 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;
-LOCATE UGROUP "hit_25" SITE "R103C133D" ;
+UGROUP "hitBuf_25" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_25_hit_mux_ch;
+LOCATE UGROUP "hitBuf_25" SITE "R103C133D" ;
 UGROUP "ff_en_25" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_25_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_25" SITE "R102C156D" ;
@@ -270,9 +270,9 @@ LOCATE UGROUP "ff_en_25" SITE "R102C156D" ;
 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;
-LOCATE UGROUP "hit_26" SITE "R105C133D" ;
+UGROUP "hitBuf_26" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_26_hit_mux_ch;
+LOCATE UGROUP "hitBuf_26" SITE "R105C133D" ;
 UGROUP "ff_en_26" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_26_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_26" SITE "R104C156D" ;
@@ -280,9 +280,9 @@ LOCATE UGROUP "ff_en_26" SITE "R104C156D" ;
 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;
-LOCATE UGROUP "hit_27" SITE "R112C133D" ;
+UGROUP "hitBuf_27" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_27_hit_mux_ch;
+LOCATE UGROUP "hitBuf_27" SITE "R112C133D" ;
 UGROUP "ff_en_27" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_27_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_27" SITE "R111C156D" ;
@@ -290,9 +290,9 @@ LOCATE UGROUP "ff_en_27" SITE "R111C156D" ;
 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;
-LOCATE UGROUP "hit_28" SITE "R114C133D" ;
+UGROUP "hitBuf_28" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_28_hit_mux_ch;
+LOCATE UGROUP "hitBuf_28" SITE "R114C133D" ;
 UGROUP "ff_en_28" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_28_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_28" SITE "R113C156D" ;
@@ -300,9 +300,9 @@ LOCATE UGROUP "ff_en_28" SITE "R113C156D" ;
 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;
-LOCATE UGROUP "hit_29" SITE "R92C60D" ;
+UGROUP "hitBuf_29" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_29_hit_mux_ch;
+LOCATE UGROUP "hitBuf_29" SITE "R92C60D" ;
 UGROUP "ff_en_29" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_29_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_29" SITE "R91C83D" ;
@@ -310,9 +310,9 @@ LOCATE UGROUP "ff_en_29" SITE "R91C83D" ;
 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;
-LOCATE UGROUP "hit_30" SITE "R105C60D" ;
+UGROUP "hitBuf_30" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_30_hit_mux_ch;
+LOCATE UGROUP "hitBuf_30" SITE "R105C60D" ;
 UGROUP "ff_en_30" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_30_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_30" SITE "R104C83D" ;
@@ -320,9 +320,9 @@ LOCATE UGROUP "ff_en_30" SITE "R104C83D" ;
 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;
-LOCATE UGROUP "hit_31" SITE "R114C60D" ;
+UGROUP "hitBuf_31" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_31_hit_mux_ch;
+LOCATE UGROUP "hitBuf_31" SITE "R114C60D" ;
 UGROUP "ff_en_31" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_31_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_31" SITE "R113C83D" ;
@@ -330,9 +330,9 @@ LOCATE UGROUP "ff_en_31" SITE "R113C83D" ;
 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;
-LOCATE UGROUP "hit_32" SITE "R85C60D" ;
+UGROUP "hitBuf_32" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_32_hit_mux_ch;
+LOCATE UGROUP "hitBuf_32" SITE "R85C60D" ;
 UGROUP "ff_en_32" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_32_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_32" SITE "R84C83D" ;
@@ -340,9 +340,9 @@ LOCATE UGROUP "ff_en_32" SITE "R84C83D" ;
 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;
-LOCATE UGROUP "hit_33" SITE "R9C60D" ;
+UGROUP "hitBuf_33" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_33_hit_mux_ch;
+LOCATE UGROUP "hitBuf_33" SITE "R9C60D" ;
 UGROUP "ff_en_33" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_33_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_33" SITE "R8C83D" ;
@@ -350,9 +350,9 @@ LOCATE UGROUP "ff_en_33" SITE "R8C83D" ;
 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;
-LOCATE UGROUP "hit_34" SITE "R22C60D" ;
+UGROUP "hitBuf_34" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_34_hit_mux_ch;
+LOCATE UGROUP "hitBuf_34" SITE "R22C60D" ;
 UGROUP "ff_en_34" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_34_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_34" SITE "R21C83D" ;
@@ -360,9 +360,9 @@ LOCATE UGROUP "ff_en_34" SITE "R21C83D" ;
 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;
-LOCATE UGROUP "hit_35" SITE "R31C60D" ;
+UGROUP "hitBuf_35" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_35_hit_mux_ch;
+LOCATE UGROUP "hitBuf_35" SITE "R31C60D" ;
 UGROUP "ff_en_35" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_35_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_35" SITE "R30C83D" ;
@@ -370,9 +370,9 @@ LOCATE UGROUP "ff_en_35" SITE "R30C83D" ;
 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;
-LOCATE UGROUP "hit_36" SITE "R36C60D" ;
+UGROUP "hitBuf_36" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_36_hit_mux_ch;
+LOCATE UGROUP "hitBuf_36" SITE "R36C60D" ;
 UGROUP "ff_en_36" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_36_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_36" SITE "R35C83D" ;
@@ -380,9 +380,9 @@ LOCATE UGROUP "ff_en_36" SITE "R35C83D" ;
 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;
-LOCATE UGROUP "hit_37" SITE "R49C60D" ;
+UGROUP "hitBuf_37" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_37_hit_mux_ch;
+LOCATE UGROUP "hitBuf_37" SITE "R49C60D" ;
 UGROUP "ff_en_37" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_37_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_37" SITE "R48C83D" ;
@@ -390,9 +390,9 @@ LOCATE UGROUP "ff_en_37" SITE "R48C83D" ;
 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;
-LOCATE UGROUP "hit_38" SITE "R9C4D" ;
+UGROUP "hitBuf_38" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_38_hit_mux_ch;
+LOCATE UGROUP "hitBuf_38" SITE "R9C4D" ;
 UGROUP "ff_en_38" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_38_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_38" SITE "R8C27D" ;
@@ -400,9 +400,9 @@ LOCATE UGROUP "ff_en_38" SITE "R8C27D" ;
 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;
-LOCATE UGROUP "hit_39" SITE "R11C4D" ;
+UGROUP "hitBuf_39" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_39_hit_mux_ch;
+LOCATE UGROUP "hitBuf_39" SITE "R11C4D" ;
 UGROUP "ff_en_39" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_39_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_39" SITE "R10C27D" ;
@@ -410,9 +410,9 @@ LOCATE UGROUP "ff_en_39" SITE "R10C27D" ;
 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;
-LOCATE UGROUP "hit_40" SITE "R22C4D" ;
+UGROUP "hitBuf_40" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_40_hit_mux_ch;
+LOCATE UGROUP "hitBuf_40" SITE "R22C4D" ;
 UGROUP "ff_en_40" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_40_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_40" SITE "R21C27D" ;
@@ -420,9 +420,9 @@ LOCATE UGROUP "ff_en_40" SITE "R21C27D" ;
 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;
-LOCATE UGROUP "hit_41" SITE "R24C4D" ;
+UGROUP "hitBuf_41" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_41_hit_mux_ch;
+LOCATE UGROUP "hitBuf_41" SITE "R24C4D" ;
 UGROUP "ff_en_41" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_41_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_41" SITE "R23C27D" ;
@@ -430,9 +430,9 @@ LOCATE UGROUP "ff_en_41" SITE "R23C27D" ;
 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;
-LOCATE UGROUP "hit_42" SITE "R31C4D" ;
+UGROUP "hitBuf_42" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_42_hit_mux_ch;
+LOCATE UGROUP "hitBuf_42" SITE "R31C4D" ;
 UGROUP "ff_en_42" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_42_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_42" SITE "R30C27D" ;
@@ -440,9 +440,9 @@ LOCATE UGROUP "ff_en_42" SITE "R30C27D" ;
 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;
-LOCATE UGROUP "hit_43" SITE "R33C4D" ;
+UGROUP "hitBuf_43" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_43_hit_mux_ch;
+LOCATE UGROUP "hitBuf_43" SITE "R33C4D" ;
 UGROUP "ff_en_43" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_43_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_43" SITE "R32C27D" ;
@@ -450,9 +450,9 @@ LOCATE UGROUP "ff_en_43" SITE "R32C27D" ;
 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;
-LOCATE UGROUP "hit_44" SITE "R36C4D" ;
+UGROUP "hitBuf_44" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_44_hit_mux_ch;
+LOCATE UGROUP "hitBuf_44" SITE "R36C4D" ;
 UGROUP "ff_en_44" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_44_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_44" SITE "R35C27D" ;
@@ -460,9 +460,9 @@ LOCATE UGROUP "ff_en_44" SITE "R35C27D" ;
 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;
-LOCATE UGROUP "hit_45" SITE "R38C4D" ;
+UGROUP "hitBuf_45" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_45_hit_mux_ch;
+LOCATE UGROUP "hitBuf_45" SITE "R38C4D" ;
 UGROUP "ff_en_45" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_45_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_45" SITE "R37C27D" ;
@@ -470,9 +470,9 @@ LOCATE UGROUP "ff_en_45" SITE "R37C27D" ;
 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;
-LOCATE UGROUP "hit_46" SITE "R49C4D" ;
+UGROUP "hitBuf_46" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_46_hit_mux_ch;
+LOCATE UGROUP "hitBuf_46" SITE "R49C4D" ;
 UGROUP "ff_en_46" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_46_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_46" SITE "R48C27D" ;
@@ -480,9 +480,9 @@ LOCATE UGROUP "ff_en_46" SITE "R48C27D" ;
 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;
-LOCATE UGROUP "hit_47" SITE "R51C4D" ;
+UGROUP "hitBuf_47" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_47_hit_mux_ch;
+LOCATE UGROUP "hitBuf_47" SITE "R51C4D" ;
 UGROUP "ff_en_47" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_47_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_47" SITE "R50C27D" ;
@@ -490,9 +490,9 @@ LOCATE UGROUP "ff_en_47" SITE "R50C27D" ;
 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;
-LOCATE UGROUP "hit_48" SITE "R54C4D" ;
+UGROUP "hitBuf_48" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_48_hit_mux_ch;
+LOCATE UGROUP "hitBuf_48" SITE "R54C4D" ;
 UGROUP "ff_en_48" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_48_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_48" SITE "R53C27D" ;
@@ -500,9 +500,9 @@ LOCATE UGROUP "ff_en_48" SITE "R53C27D" ;
 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;
-LOCATE UGROUP "hit_49" SITE "R56C4D" ;
+UGROUP "hitBuf_49" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_49_hit_mux_ch;
+LOCATE UGROUP "hitBuf_49" SITE "R56C4D" ;
 UGROUP "ff_en_49" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_49_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_49" SITE "R55C27D" ;
@@ -510,9 +510,9 @@ LOCATE UGROUP "ff_en_49" SITE "R55C27D" ;
 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;
-LOCATE UGROUP "hit_50" SITE "R90C60D" ;
+UGROUP "hitBuf_50" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_50_hit_mux_ch;
+LOCATE UGROUP "hitBuf_50" SITE "R90C60D" ;
 UGROUP "ff_en_50" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_50_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_50" SITE "R89C83D" ;
@@ -520,9 +520,9 @@ LOCATE UGROUP "ff_en_50" SITE "R89C83D" ;
 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;
-LOCATE UGROUP "hit_51" SITE "R103C60D" ;
+UGROUP "hitBuf_51" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_51_hit_mux_ch;
+LOCATE UGROUP "hitBuf_51" SITE "R103C60D" ;
 UGROUP "ff_en_51" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_51_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_51" SITE "R102C83D" ;
@@ -530,9 +530,9 @@ LOCATE UGROUP "ff_en_51" SITE "R102C83D" ;
 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;
-LOCATE UGROUP "hit_52" SITE "R112C60D" ;
+UGROUP "hitBuf_52" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_52_hit_mux_ch;
+LOCATE UGROUP "hitBuf_52" SITE "R112C60D" ;
 UGROUP "ff_en_52" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_52_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_52" SITE "R111C83D" ;
@@ -540,9 +540,9 @@ LOCATE UGROUP "ff_en_52" SITE "R111C83D" ;
 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;
-LOCATE UGROUP "hit_53" SITE "R67C4D" ;
+UGROUP "hitBuf_53" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_53_hit_mux_ch;
+LOCATE UGROUP "hitBuf_53" SITE "R67C4D" ;
 UGROUP "ff_en_53" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_53_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_53" SITE "R66C27D" ;
@@ -550,9 +550,9 @@ LOCATE UGROUP "ff_en_53" SITE "R66C27D" ;
 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;
-LOCATE UGROUP "hit_54" SITE "R69C4D" ;
+UGROUP "hitBuf_54" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_54_hit_mux_ch;
+LOCATE UGROUP "hitBuf_54" SITE "R69C4D" ;
 UGROUP "ff_en_54" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_54_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_54" SITE "R68C27D" ;
@@ -560,9 +560,9 @@ LOCATE UGROUP "ff_en_54" SITE "R68C27D" ;
 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;
-LOCATE UGROUP "hit_55" SITE "R72C4D" ;
+UGROUP "hitBuf_55" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_55_hit_mux_ch;
+LOCATE UGROUP "hitBuf_55" SITE "R72C4D" ;
 UGROUP "ff_en_55" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_55_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_55" SITE "R71C27D" ;
@@ -570,9 +570,9 @@ LOCATE UGROUP "ff_en_55" SITE "R71C27D" ;
 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;
-LOCATE UGROUP "hit_56" SITE "R74C4D" ;
+UGROUP "hitBuf_56" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_56_hit_mux_ch;
+LOCATE UGROUP "hitBuf_56" SITE "R74C4D" ;
 UGROUP "ff_en_56" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_56_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_56" SITE "R73C27D" ;
@@ -580,9 +580,9 @@ LOCATE UGROUP "ff_en_56" SITE "R73C27D" ;
 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;
-LOCATE UGROUP "hit_57" SITE "R85C4D" ;
+UGROUP "hitBuf_57" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_57_hit_mux_ch;
+LOCATE UGROUP "hitBuf_57" SITE "R85C4D" ;
 UGROUP "ff_en_57" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_57_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_57" SITE "R84C27D" ;
@@ -590,9 +590,9 @@ LOCATE UGROUP "ff_en_57" SITE "R84C27D" ;
 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;
-LOCATE UGROUP "hit_58" SITE "R87C4D" ;
+UGROUP "hitBuf_58" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_58_hit_mux_ch;
+LOCATE UGROUP "hitBuf_58" SITE "R87C4D" ;
 UGROUP "ff_en_58" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_58_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_58" SITE "R86C27D" ;
@@ -600,9 +600,9 @@ LOCATE UGROUP "ff_en_58" SITE "R86C27D" ;
 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;
-LOCATE UGROUP "hit_59" SITE "R90C4D" ;
+UGROUP "hitBuf_59" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_59_hit_mux_ch;
+LOCATE UGROUP "hitBuf_59" SITE "R90C4D" ;
 UGROUP "ff_en_59" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_59_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_59" SITE "R89C27D" ;
@@ -610,9 +610,9 @@ LOCATE UGROUP "ff_en_59" SITE "R89C27D" ;
 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;
-LOCATE UGROUP "hit_60" SITE "R92C4D" ;
+UGROUP "hitBuf_60" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_60_hit_mux_ch;
+LOCATE UGROUP "hitBuf_60" SITE "R92C4D" ;
 UGROUP "ff_en_60" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_60_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_60" SITE "R91C27D" ;
@@ -620,9 +620,9 @@ LOCATE UGROUP "ff_en_60" SITE "R91C27D" ;
 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;
-LOCATE UGROUP "hit_61" SITE "R103C4D" ;
+UGROUP "hitBuf_61" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_61_hit_mux_ch;
+LOCATE UGROUP "hitBuf_61" SITE "R103C4D" ;
 UGROUP "ff_en_61" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_61_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_61" SITE "R102C27D" ;
@@ -630,9 +630,9 @@ LOCATE UGROUP "ff_en_61" SITE "R102C27D" ;
 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;
-LOCATE UGROUP "hit_62" SITE "R105C4D" ;
+UGROUP "hitBuf_62" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_62_hit_mux_ch;
+LOCATE UGROUP "hitBuf_62" SITE "R105C4D" ;
 UGROUP "ff_en_62" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_62_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_62" SITE "R104C27D" ;
@@ -640,9 +640,9 @@ LOCATE UGROUP "ff_en_62" SITE "R104C27D" ;
 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;
-LOCATE UGROUP "hit_63" SITE "R112C4D" ;
+UGROUP "hitBuf_63" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_63_hit_mux_ch;
+LOCATE UGROUP "hitBuf_63" SITE "R112C4D" ;
 UGROUP "ff_en_63" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_63_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_63" SITE "R111C27D" ;
@@ -650,9 +650,9 @@ LOCATE UGROUP "ff_en_63" SITE "R111C27D" ;
 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;
-LOCATE UGROUP "hit_64" SITE "R114C4D" ;
+UGROUP "hitBuf_64" BBOX 1 1
+       BLKNAME THE_TDC/GEN_hit_mux_64_hit_mux_ch;
+LOCATE UGROUP "hitBuf_64" SITE "R114C4D" ;
 UGROUP "ff_en_64" BBOX 1 1
        BLKNAME THE_TDC/GEN_Channels_64_Channels/Channel200/ff_array_en_i_1_i;
 LOCATE UGROUP "ff_en_64" SITE "R113C27D" ;
@@ -661,240 +661,15 @@ LOCATE UGROUP "ff_en_64" SITE "R113C27D" ;
 ##############################################################################
 ##                          CHANNEL PLACEMENTS                             ##
 ##############################################################################
-UGROUP "EF_ref" BBOX 16 54
-               BLKNAME THE_TDC/ReferenceChannel/Channel200
-       BLKNAME THE_TDC/GEN_Channels_1_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_2_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_3_Channels/Channel200
-       BLKNAME THE_TDC/ReferenceChannel/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_1_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_2_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_3_Channels/The_Buffer;
-LOCATE UGROUP "EF_ref" SITE "R8C128D" ;
-
-UGROUP "EF_4" BBOX 10 54
-               BLKNAME THE_TDC/GEN_Channels_4_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_5_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_4_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_5_Channels/The_Buffer;
-LOCATE UGROUP "EF_4" SITE "R24C128D" ;
-
-UGROUP "EF_6" BBOX 17 54
-       BLKNAME THE_TDC/GEN_Channels_6_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_7_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_8_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_9_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_6_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_7_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_8_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_9_Channels/The_Buffer;
-LOCATE UGROUP "EF_6" SITE "R35C128D" ;
-
-UGROUP "EF_10" BBOX 17 54
-       BLKNAME THE_TDC/GEN_Channels_10_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_11_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_17_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_18_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_10_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_11_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_17_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_18_Channels/The_Buffer;
-LOCATE UGROUP "EF_10" SITE "R53C128D" ;
-
-UGROUP "EF_12" BBOX 16 54
-       BLKNAME THE_TDC/GEN_Channels_12_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_13_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_33_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_34_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_12_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_13_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_33_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_34_Channels/The_Buffer;
-LOCATE UGROUP "EF_12" SITE "R8C56D" ;
-
-UGROUP "EF_14" BBOX 10 54
-       BLKNAME THE_TDC/GEN_Channels_14_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_35_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_14_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_35_Channels/The_Buffer;
-LOCATE UGROUP "EF_14" SITE "R24C56D" ;
-
-UGROUP "EF_15" BBOX 17 54
-       BLKNAME THE_TDC/GEN_Channels_15_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_16_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_36_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_37_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_15_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_16_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_36_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_37_Channels/The_Buffer;
-LOCATE UGROUP "EF_15" SITE "R35C56D" ;
-
-UGROUP "EF_19" BBOX 17 54
-       BLKNAME THE_TDC/GEN_Channels_19_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_20_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_21_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_22_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_19_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_20_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_21_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_22_Channels/The_Buffer;
-LOCATE UGROUP "EF_19" SITE "R71C128D" ;
-
-UGROUP "EF_23" BBOX 16 54
-       BLKNAME THE_TDC/GEN_Channels_23_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_24_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_25_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_26_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_23_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_24_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_25_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_26_Channels/The_Buffer;
-LOCATE UGROUP "EF_23" SITE "R89C128D" ;
-
-UGROUP "EF_27" BBOX 10 54
-       BLKNAME THE_TDC/GEN_Channels_27_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_28_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_27_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_28_Channels/The_Buffer;
-LOCATE UGROUP "EF_27" SITE "R105C128D" ;
-
-UGROUP "EF_29" BBOX 16 54
-       BLKNAME THE_TDC/GEN_Channels_29_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_30_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_50_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_51_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_29_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_30_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_50_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_51_Channels/The_Buffer;
-LOCATE UGROUP "EF_29" SITE "R89C56D" ;
-
-UGROUP "EF_31" BBOX 10 54
-       BLKNAME THE_TDC/GEN_Channels_31_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_52_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_31_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_52_Channels/The_Buffer;
-LOCATE UGROUP "EF_31" SITE "R105C56D" ;
-
-UGROUP "EF_32" BBOX 10 24
-       BLKNAME THE_TDC/GEN_Channels_32_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_32_Channels/The_Buffer;
-LOCATE UGROUP "EF_32" SITE "R78C71D" ;
-
-UGROUP "EF_38" BBOX 16 54
-       BLKNAME THE_TDC/GEN_Channels_38_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_39_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_40_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_41_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_38_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_39_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_40_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_41_Channels/The_Buffer;
-LOCATE UGROUP "EF_38" SITE "R8C2D" ;
-
-UGROUP "EF_42" BBOX 10 54
-       BLKNAME THE_TDC/GEN_Channels_42_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_43_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_42_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_43_Channels/The_Buffer;
-LOCATE UGROUP "EF_42" SITE "R24C2D" ;
-
-UGROUP "EF_44" BBOX 17 54
-       BLKNAME THE_TDC/GEN_Channels_44_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_45_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_46_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_47_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_44_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_45_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_46_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_47_Channels/The_Buffer;
-LOCATE UGROUP "EF_44" SITE "R35C2D" ;
-
-UGROUP "EF_48" BBOX 17 54
-       BLKNAME THE_TDC/GEN_Channels_48_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_49_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_53_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_54_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_48_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_49_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_53_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_54_Channels/The_Buffer;
-LOCATE UGROUP "EF_48" SITE "R53C2D" ;
-
-UGROUP "EF_55" BBOX 17 54
-       BLKNAME THE_TDC/GEN_Channels_55_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_56_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_57_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_58_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_55_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_56_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_57_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_58_Channels/The_Buffer;
-LOCATE UGROUP "EF_55" SITE "R71C2D" ;
-
-UGROUP "EF_59" BBOX 16 54
-       BLKNAME THE_TDC/GEN_Channels_59_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_60_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_61_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_62_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_59_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_60_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_61_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_62_Channels/The_Buffer;
-LOCATE UGROUP "EF_59" SITE "R89C2D" ;
-
-UGROUP "EF_63" BBOX 10 54
-       BLKNAME THE_TDC/GEN_Channels_63_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_64_Channels/Channel200
-       BLKNAME THE_TDC/GEN_Channels_63_Channels/The_Buffer
-       BLKNAME THE_TDC/GEN_Channels_64_Channels/The_Buffer;
-LOCATE UGROUP "EF_63" SITE "R105C2D" ;
 
 #############################################################################
 ## Coarse counter register placement
 #############################################################################
 
-UGROUP "UR_Coarse_Counter"
-       BLKNAME THE_TDC/GenCoarseCounter_1_TheCoarseCounter;
-LOCATE UGROUP "UR_Coarse_Counter" SITE R36C134D;
-UGROUP "LR_Coarse_Counter"
-       BLKNAME THE_TDC/GenCoarseCounter_2_TheCoarseCounter;
-LOCATE UGROUP "LR_Coarse_Counter" SITE R85C134D;
-UGROUP "UL_Coarse_Counter"
-        BLKNAME THE_TDC/GenCoarseCounter_3_TheCoarseCounter;
-LOCATE UGROUP "UL_Coarse_Counter" SITE R36C50D;
-UGROUP "LL_Coarse_Counter"
-        BLKNAME THE_TDC/GenCoarseCounter_4_TheCoarseCounter;
-LOCATE UGROUP "LL_Coarse_Counter" SITE R85C50D;
-UGROUP "TheCounters"
-       BLKNAME THE_TDC/GenCoarseCounter_0_TheCoarseCounter
-       BLKNAME THE_TDC/TheEpochCounter;
-#LOCATE UGROUP "TheCounters" REGION REGION_READOUT;
-
 #############################################################################
 ## Other Logic Placements
 #############################################################################
 
-UGROUP "BusHandlers"
-       BLKNAME THE_TDC/TheHitCounterBus
-       BLKNAME THE_TDC/TheStatusRegistersBus
-#       BLKNAME THE_TDC/TheLostHitBus
-#       BLKNAME THE_TDC/TheEncoderStartBus
-#       BLKNAME THE_TDC/TheEncoderFinishedBus
-;
-LOCATE UGROUP "BusHandlers" REGION "REGION_TRBNET";
-LOCATE PGROUP "BusHandlers" REGION "REGION_TRBNET";
-
-UGROUP "TheTdcReadout"  #BBOX 35 57  
-  BLKNAME THE_TDC/TheReadout
-  ;
-#LOCATE UGROUP "TheTdcReadout" SITE "R53C53D";
-
-UGROUP "TheTriggerHandler"
-  BLKNAME THE_TDC/TheTriggerHandler
-  ;
-LOCATE UGROUP "TheTriggerHandler" SITE "R65C80D";
 
 #############################################################################
 ##                         Unimportant Data Lines                          ##
@@ -902,27 +677,33 @@ LOCATE UGROUP "TheTriggerHandler" SITE "R65C80D";
 
 BLOCK NET "THE_TDC/reset_tdc*" ;
 BLOCK NET "THE_TDC/reset_rdo*" ;
-BLOCK NET "THE_TDC/hit_in_i_*" ;
+#BLOCK NET "THE_TDC/hit_in_i_*" ;
+BLOCK NET "THE_TDC/hit_latch*" ;
 BLOCK NET "THE_TDC/reset_counters_i*" ;
-BLOCK PATH TO CELL "THE_TDC/GEN_Channels_*_Channels/sync_q_2*";
+BLOCK PATH TO CELL "THE_TDC/GEN_Channels*Channels/sync_q_2*";
 
 
 
-#BLOCK PATH TO CELL "THE_TDC/GEN_Channels_*_Channels/Channel200/SimAdderNo_FC/FF_*" ;
+
+#BLOCK PATH TO CELL "THE_TDC/GEN_Channels*Channels/Channel200/SimAdderNo_FC/FF_*" ;
 
 
 
 PROHIBIT SECONDARY NET "THE_TDC/ReferenceChannel/Channel200/ff_array_en_i";
-PROHIBIT SECONDARY NET "THE_TDC/GEN_Channels_*_Channels/Channel200/ff_array_en_i";
+PROHIBIT SECONDARY NET "THE_TDC/GEN_Channels*Channels/Channel200/ff_array_en_i";
 
-MAXDELAY NET "THE_TDC/ReferenceChannel/hit_buf" 0.600000 nS DATAPATH_ONLY ;
-MAXDELAY NET "THE_TDC/GEN_Channels_*_Channels/hit_buf" 0.600000 nS DATAPATH_ONLY ;
+#MAXDELAY NET "THE_TDC/ReferenceChannel/hit_buf" 0.600000 nS DATAPATH_ONLY ;
+#MAXDELAY NET "THE_TDC/GEN_Channels*Channels/hit_buf" 0.600000 nS DATAPATH_ONLY ;
+#MAXDELAY NET "THE_TDC/hit_in_i[*]" 0.600000 nS; #DATAPATH_ONLY ;
 
-MULTICYCLE FROM CELL "THE_TDC/GEN_Channels_*_Channels/gen_DEBUG_risingEdgeDetect_1/PULSE_OUT" 5 x;
+MULTICYCLE FROM CELL "THE_TDC/GEN_Channels*Channels/gen_DEBUG_risingEdgeDetect_1/PULSE_OUT" 5 x;
 MULTICYCLE FROM CELL "THE_TDC/ReferenceChannel/gen_DEBUG_risingEdgeDetect_1/PULSE_OUT" 5 x;
-MULTICYCLE FROM CELL "THE_TDC/TheEpochCounter/counter_*" TO CELL "THE_TDC/GEN_Channels_*_Channels/epoch_cntr_reg*" 5 X;
-MULTICYCLE FROM CELL "THE_TDC/TheEpochCounter/counter_*" TO CELL "THE_TDC/ReferenceChannel/epoch_cntr_reg*" 5 X;
+
+MULTICYCLE FROM CELL "THE_TDC/TheEpochCounter/counter*" TO CELL "THE_TDC/GEN_Channels*Channels/epoch_cntr_reg*" 5 X;
+MULTICYCLE FROM CELL "THE_TDC/TheEpochCounter/counter*" TO CELL "THE_TDC/ReferenceChannel/epoch_cntr_reg*" 5 X;
+
 MULTICYCLE FROM CELL "THE_RESET_HANDLER/final_reset_1" 50 ns;
-MULTICYCLE FROM CELL "THE_TDC/GEN_Channels_*_Channels/The_Buffer/*" TO CELL "THE_TDC/TheReadout/rd_en_*" 2 X;
+MULTICYCLE FROM CELL "THE_TDC/GEN_Channels*Channels/The_Buffer/*" TO CELL "THE_TDC/TheReadout/rd_en*" 2 X;
 
-#MULTICYCLE FROM CLKNET "clk_100_internal_c" TO CLKNET "CLK_PCLK_LEFT" 2 X ;
+MULTICYCLE FROM CLKNET "clk_100_internal_c" TO CLKNET "CLK_PCLK_LEFT" 2 X ;
+MULTICYCLE FROM CLKNET "CLK_PCLK_LEFT" TO CLKNET "clk_100_internal_c" 2 X ;

diff --git a/tdc_releases/tdc_v1.6/trbnet_constraints.lpf b/tdc_releases/tdc_v1.6/trbnet_constraints.lpf
index 2e8b1a7a30ecb08c63e7f4078bb8f4edbcdd1e9e..8bed686534bebee3ddaada8b54da09bc2faff023 100644 (file)
--- a/tdc_releases/tdc_v1.6/trbnet_constraints.lpf
+++ b/tdc_releases/tdc_v1.6/trbnet_constraints.lpf
@@ -8,14 +8,6 @@ GSR_NET NET "reset_i";
 #################################################################
 LOCATE COMP   "THE_MEDIA_UPLINK/gen_serdes_1_200_THE_SERDES/PCSD_INST" SITE "PCSA" ;
 
-REGION "MEDIA_UPLINK" "R105C110D" 10 18;
-REGION "REGION_SPI"   "R2C110D" 15 18 DEVSIZE;
-REGION "REGION_TRBNET" "R17C110D"  95 18 DEVSIZE;
-
-#LOCATE UGROUP "THE_SPI_MASTER/SPI_group" REGION "REGION_SPI" ; 
-#LOCATE UGROUP "THE_SPI_MEMORY/SPI_group" REGION "REGION_SPI" ;
-LOCATE UGROUP "THE_MEDIA_UPLINK/media_interface_group" REGION "MEDIA_UPLINK" ;
-
 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;
@@ -26,48 +18,3 @@ MULTICYCLE TO CELL "THE_SPI_MASTER_THE_SPI_SLIM_tx_sreg_oregio*" 20 ns;
 BLOCK PATH TO CELL "gen_TRIGGER_LOGIC_THE_TRIG_LOGIC/out_*";
 
 #Jan: Placement of TrbNet components (at least, most of them)
-
-#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_3_geniobuf_gen_regio_regIO/the_addresses/HUBLOGIC_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/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";
-
-UGROUP "ENDPOINT"
-       BLKNAME THE_ENDPOINT/THE_ENDPOINT/genbuffers_0_geniobuf_gentrgapi_the_trigger_apl
-;
-LOCATE UGROUP "ENDPOINT" REGION "REGION_TRBNET";
-
-UGROUP "SctrlGroup"
-  BLKNAME THE_BUS_HANDLER
-  BLKNAME THE_ENDPOINT/THE_INTERNAL_BUS_HANDLER
-  ;
-LOCATE UGROUP "SctrlGroup" REGION "REGION_TRBNET";
-
-
-UGROUP "ResetHandler"
-       BLKNAME THE_RESET_HANDLER
-;
-
-
-