]> jspc29.x-matter.uni-frankfurt.de Git - tdc.git/commitdiff
changed input edge register description sep17
authorJan Michel <michel@physik.uni-frankfurt.de>
Mon, 22 Jul 2024 07:27:15 +0000 (09:27 +0200)
committerJan Michel <michel@physik.uni-frankfurt.de>
Mon, 22 Jul 2024 07:27:15 +0000 (09:27 +0200)
releases/tdc_v2.3/TDC_record.vhd

index d9f3652e9fc8b70b91c44319634a6c700d69f747..59f8f0671878646f0e19a269bb4dfff87ec2912f 100644 (file)
@@ -625,11 +625,14 @@ begin
 -------------------------------------------------------------------------------
 -- Hit Counters
   GenHitCounter : for i in 0 to CHANNEL_NUMBER-1 generate
-    edge_rising_100(i) <= '0' when edge_rising_100_3r(i) = '1' else
-                          '1' when rising_edge(hit_in_s(i));
-    edge_rising_100_r(i)  <= edge_rising_100(i)                                 when rising_edge(CLK_READOUT);
-    edge_rising_100_2r(i) <= edge_rising_100_r(i)                               when rising_edge(CLK_READOUT);
-    edge_rising_100_3r(i) <= edge_rising_100_r(i) and not edge_rising_100_2r(i) when rising_edge(CLK_READOUT);
+    --edge_rising_100(i) <= '0' when edge_rising_100_3r(i) = '1' else
+                          --'1' when rising_edge(hit_in_s(i));
+    edge_rising_100(i) <= (hit_in_s(i) or edge_rising_100(i)) and not edge_rising_100_r(i);
+                          
+    edge_rising_100_r(i)  <= hit_in_s(i) or edge_rising_100(i)                   when rising_edge(CLK_READOUT);
+    edge_rising_100_2r(i) <= edge_rising_100_r(i)                                when rising_edge(CLK_READOUT);
+    edge_rising_100_3r(i) <= edge_rising_100_2r(i)                               when rising_edge(CLK_READOUT);
+    --edge_rising_100_3r(i) <= edge_rising_100_1r(i) and not edge_rising_100_2r(i) when rising_edge(CLK_READOUT);
 
     --purpose: Counts the detected hits
     Hit_Detect_Counter : process (CLK_READOUT)
@@ -637,7 +640,7 @@ begin
       if rising_edge(CLK_READOUT) then
         if RESET_COUNTERS = '1' then
           ch_hit_detect_cntr(i) <= (others => '0');
-        elsif edge_rising_100_3r(i) = '1' then
+        elsif edge_rising_100_2r(i) = '1' and edge_rising_100_3r(i) = '0' then
           ch_hit_detect_cntr(i) <= ch_hit_detect_cntr(i) + to_unsigned(1, 31);
         end if;
       end if;