From 98fa9ded88f7a3b3dea7e5fe4c2deda67995d8ee Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Mon, 6 Jan 2025 13:58:49 +0100 Subject: [PATCH] change to calibration trigger type A only --- code/HitBuffer.vhd | 8 ++++---- code/ReadoutHandler.vhd | 2 +- code/TDC_FF.vhd | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/HitBuffer.vhd b/code/HitBuffer.vhd index 21baeb9..97805f4 100644 --- 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 08a7048..41aeca6 100644 --- 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 a04c99e..8f48cea 100644 --- 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 -- 2.43.0