minor changes to TDC/Calib handling

diff --git a/combiner_cts/combiner.vhd b/combiner_cts/combiner.vhd
index 0c2cea069bb769c9eaebae940c85bde3d383fd12..d0ff924783be052c7e762c6a5baba9839ef13002 100644 (file)
--- a/combiner_cts/combiner.vhd
+++ b/combiner_cts/combiner.vhd
@@ -1144,21 +1144,21 @@ THE_CRI_INTERFACE : entity work.trb_net16_cri_interface
 --         INFO_IN            => timer,
 --         LOGIC_ANALYSER_OUT => open
 --         );
--- 
 
+ -- end generate;--TDC
     -- 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
       hit_in_i(NUM_TDC_CHANNELS-1 downto 1) <= (others => '0');
     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) <= '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;--
+      hit_in_i(1) <= async_ext_trig;--'0';--RJ45_SIG_1;--
+      hit_in_i(2) <= cts_ext_trigger;--RJ45_SIG_1;--
+      hit_in_i(3) <= async_ext_trig;--'0';--RJ45_SIG_1;--
+      hit_in_i(4) <= cts_ext_trigger;--'0';--RJ45_SIG_1;--
     end generate;
 
- -- end generate;--TDC
+
   
   
   

diff --git a/combiner_cts/config.vhd b/combiner_cts/config.vhd
index 280babc506b86512ddce643d5bccac7212ffe0f8..d066aafdc2491600fd98faf04795990e675b03c8 100644 (file)
--- a/combiner_cts/config.vhd
+++ b/combiner_cts/config.vhd
@@ -31,7 +31,7 @@ package config is
     
 --TDC    
     constant NUM_TDC_MODULES         : integer range 1 to 4  := 1;  -- number of tdc modules to implement
-    constant NUM_TDC_CHANNELS        : integer range 1 to 65 := 6; -- number of tdc channels per module
+    constant NUM_TDC_CHANNELS        : integer range 1 to 65 := 5;--5; -- number of tdc channels per module
     constant NUM_TDC_CHANNELS_POWER2 : integer range 0 to 6  := 4;  --the nearest power of two, for convenience reasons 
     constant DOUBLE_EDGE_TYPE        : integer range 0 to 3  := 0;  --double edge type:  0, 1, 2,  3
     -- 0: single edge only,
@@ -44,7 +44,9 @@ package config is
     
     
     --input monitor and trigger generation logic
-    constant INCLUDE_TDC            : integer  := c_NO;--YES;
+    constant INCLUDE_CALIBRATION    : integer  := c_NO;
+    constant INCLUDE_TDC            : integer  := c_NO;--YES;  -- IMPORTANT: TDC part into entity has to be commented in/out by hand
+                                                          --            (no generic possible due to constraints naming)
     constant INCLUDE_TRIGGER_LOGIC  : integer  := c_YES;
     constant INCLUDE_STATISTICS     : integer  := c_YES;
     constant TRIG_GEN_INPUT_NUM     : integer  := 24;
@@ -52,7 +54,6 @@ package config is
     constant MONITOR_INPUT_NUM      : integer  := 26;
 
     constant INCLUDE_GBE            : integer  := c_NO;
-    constant INCLUDE_CALIBRATION    : integer  := c_NO;
    
     
     constant GEN_BUSY_OUTPUT : integer := c_NO;