minor fix for a version without TDC. Now CTS is functional again.

diff --git a/combiner_cts/combiner.vhd b/combiner_cts/combiner.vhd
index 777b429406457d659ec7b5ea6f9b82bfd20fb69c..1202eaa788246e68006224016d990958bb87db64 100644 (file)
--- a/combiner_cts/combiner.vhd
+++ b/combiner_cts/combiner.vhd
@@ -1149,8 +1149,9 @@ THE_CRI_INTERFACE : entity work.trb_net16_cri_interface
 --         INFO_IN            => timer,
 --         LOGIC_ANALYSER_OUT => open
 --         );
-
-      
+-- 
+--   
+  gen_TDC_onlineCal: if (INCLUDE_TDC = c_YES) generate
     gen_onlineCal: if (INCLUDE_CALIBRATION = c_YES) generate     
         THE_TDC_CAL : entity work.TDC_Calibration
         generic map(
@@ -1198,7 +1199,8 @@ THE_CRI_INTERFACE : entity work.trb_net16_cri_interface
           bustdccal_tx.nack    <= '1';
           bustdccal_tx.unknown <= '1';
           
-    end generate; -- Calib
+    end generate; --Calib   
+  end generate; -- TDC Calib
 
     -- For single edge measurements
     gen_single : if (DOUBLE_EDGE_TYPE = 0 or DOUBLE_EDGE_TYPE = 1 or DOUBLE_EDGE_TYPE = 3 ) and (INCLUDE_ETM = c_NO) generate
@@ -1206,10 +1208,10 @@ THE_CRI_INTERFACE : entity work.trb_net16_cri_interface
     end generate;
     
     gen_single : if (DOUBLE_EDGE_TYPE = 0 or DOUBLE_EDGE_TYPE = 1 or DOUBLE_EDGE_TYPE = 3) and ((ETM_CHOICE = ETM_CHOICE_MBS_VULOM) and (INCLUDE_ETM = c_YES)) generate
-      hit_in_i(1) <= RJ45_SIG_1;--'0';
-      hit_in_i(2) <= RJ45_SIG_1;--async_ext_trig;
-      hit_in_i(3) <= RJ45_SIG_1;--cts_ext_trigger;
-      hit_in_i(4) <= RJ45_SIG_1;--'0';
+      hit_in_i(1) <= '0';--RJ45_SIG_1;--
+      hit_in_i(2) <= async_ext_trig;--RJ45_SIG_1;--
+      hit_in_i(3) <= cts_ext_trigger;--RJ45_SIG_1;--
+      hit_in_i(4) <= '0';--RJ45_SIG_1;--
     end generate;
 
  -- end generate;--TDC

diff --git a/combiner_cts/config.vhd b/combiner_cts/config.vhd
index 55b4d5465c880cdcd8dd6e8899cdc1cae9a404ce..280babc506b86512ddce643d5bccac7212ffe0f8 100644 (file)
--- a/combiner_cts/config.vhd
+++ b/combiner_cts/config.vhd
@@ -44,7 +44,7 @@ package config is
     
     
     --input monitor and trigger generation logic
-    constant INCLUDE_TDC            : integer  := c_YES;
+    constant INCLUDE_TDC            : integer  := c_NO;--YES;
     constant INCLUDE_TRIGGER_LOGIC  : integer  := c_YES;
     constant INCLUDE_STATISTICS     : integer  := c_YES;
     constant TRIG_GEN_INPUT_NUM     : integer  := 24;