change to calibration trigger type A only

diff --git a/code/HitBuffer.vhd b/code/HitBuffer.vhd
index 21baeb9a5ce413e62bce1e3ac2634b42dd0c5862..97805f428e57b5f8c6ca40ffbfa468330f2e6f0c 100644 (file)
--- a/code/HitBuffer.vhd
+++ b/code/HitBuffer.vhd
@@ -113,9 +113,9 @@ PROC_BUILD_HIT : process begin
     maxtot_timer <= maxtot_timer - 1;
   else   
     edge_rising_valid <= '0';
-    if edge_rising_valid = '1' then
-      count_edges3 <= count_edges3 + 1;
-    end if;
+    -- if edge_rising_valid = '1' then
+    --   count_edges3 <= count_edges3 + 1;
+    -- end if;
   end if;  
   
   
@@ -272,7 +272,7 @@ DATA_OUT <= hit_store(27 downto 0);
 STATUS_OUT(31 downto 0)   <= x"00" & std_logic_vector(count_edges1) when rising_edge(CLK_SYS);
 STATUS_OUT(63 downto 32)  <= x"00" & std_logic_vector(count_edges2) when rising_edge(CLK_SYS);
 STATUS_OUT(71 downto 64)  <= "00" &  hit_buffer_level when rising_edge(CLK_SYS);
-STATUS_OUT(95 downto 72)  <= x"00" & std_logic_vector(count_edges3(15 downto 0)) when rising_edge(CLK_SYS);
+-- STATUS_OUT(95 downto 72)  <= x"00" & std_logic_vector(count_edges3(15 downto 0)) when rising_edge(CLK_SYS);
 STATUS_OUT(127 downto 96) <= x"0000" & std_logic_vector(count_edges4(15 downto 0)) when rising_edge(CLK_SYS);
 
 

diff --git a/code/ReadoutHandler.vhd b/code/ReadoutHandler.vhd
index 08a7048958305d4d603687e5d0f80a26953eb4fa..41aeca6f6ed765dd7d35529db80932d89c8eea11 100644 (file)
--- a/code/ReadoutHandler.vhd
+++ b/code/ReadoutHandler.vhd
@@ -92,7 +92,7 @@ PROC_RDO_SYSTEM : process begin
         is_calib_sys      <= '0';
         timer             <= TRIGGER_WINDOW;
       elsif READOUT_RX.valid_notiming_trg = '1' then
-        if READOUT_RX.trg_type = x"d" or READOUT_RX.trg_type = x"a" then
+        if READOUT_RX.trg_type = x"a" then
           state_rdo         <= CALIB;
           is_calib_sys      <= '1';
         else

diff --git a/code/TDC_FF.vhd b/code/TDC_FF.vhd
index a04c99ecd6f3b307e26e840aeedfd28d323a2846..8f48cea4df9a3c2459f81eed49c177838da24de7 100644 (file)
--- a/code/TDC_FF.vhd
+++ b/code/TDC_FF.vhd
@@ -241,8 +241,8 @@ begin
       BUS_TX.data <= hitbuffer_status(addr)(31 downto 0);
     elsif BUS_RX.addr(15 downto 5) = x"01" & "001" then
       BUS_TX.data <= hitbuffer_status(addr)(63 downto 32);
-    elsif BUS_RX.addr(15 downto 5) = x"01" & "010" then
-      BUS_TX.data <= hitbuffer_status(addr)(95 downto 64);
+    -- elsif BUS_RX.addr(15 downto 5) = x"01" & "010" then
+      -- BUS_TX.data <= hitbuffer_status(addr)(95 downto 64);
     elsif BUS_RX.addr(15 downto 5) = x"01" & "011" then
       BUS_TX.data <= hitbuffer_status(addr)(127 downto 96);
     else