periph_padiwa is brought up-to-date with tdc_v2.1.1

diff --git a/tdc_releases/tdc_v2.1.1/trb3_periph_padiwa.vhd b/tdc_releases/tdc_v2.1.1/trb3_periph_padiwa.vhd
index 9c6420f4772f5e8ef8ea242cf04ec1768418bcbf..da43736537abc492488d59b2bd47fb5f34e8bb41 100644 (file)
--- a/tdc_releases/tdc_v2.1.1/trb3_periph_padiwa.vhd
+++ b/tdc_releases/tdc_v2.1.1/trb3_periph_padiwa.vhd
@@ -432,9 +432,9 @@ begin
       TIMING_TRIGGER_RAW        => c_YES,
       --Configure data handler
       DATA_INTERFACE_NUMBER     => 1,
-      DATA_BUFFER_DEPTH         => 12,
+      DATA_BUFFER_DEPTH         => EVENT_BUFFER_SIZE,
       DATA_BUFFER_WIDTH         => 32,
-      DATA_BUFFER_FULL_THRESH   => 2**12-400,
+      DATA_BUFFER_FULL_THRESH   => 2**EVENT_BUFFER_SIZE-EVENT_MAX_SIZE,
       TRG_RELEASE_AFTER_DATA    => c_YES,
       HEADER_BUFFER_DEPTH       => 9,
       HEADER_BUFFER_FULL_THRESH => 2**9-16

diff --git a/wasa/config.vhd b/wasa/config.vhd
index 96510e50d8d7bf3f3345e69b97377a758a4dae7b..0bef662b91a1eded22a6f54e91ac5d36e5b274aa 100644 (file)
--- a/wasa/config.vhd
+++ b/wasa/config.vhd
@@ -19,8 +19,11 @@ package config is
   -- 1: same channel,
   -- 2: alternating channels,
   -- 3: same channel with stretcher
-  constant RING_BUFFER_SIZE        : integer range 0 to 7  := 3;  --ring buffer size:  0, 1, 2,  3   --> change names in constraints file
-                                                                  --ring buffer size: 32,64,96,128
+  constant RING_BUFFER_SIZE        : integer range 0 to 7  := 7;  --ring buffer size:  0, 1, 2,  3,  7   --> change names in constraints file
+                                                                  --ring buffer size: 32,64,96,128,dyn
+
+  constant EVENT_BUFFER_SIZE       : integer range 9 to 13 := 13; -- size of the event buffer, 2**N
+  constant EVENT_MAX_SIZE          : integer := 4096;             --maximum event size. Should not exceed EVENT_BUFFER_SIZE/2
 
 --Use only every second input channel (mask slow channels from padiwa amps)
   constant USE_PADIWA_FAST_ONLY : integer := c_NO;

diff --git a/wasa/currentRelease b/wasa/currentRelease
index 43154c7d300a5b501f6e9fa8128a3d0cf528fa71..02a0ff9ca11f00331804ea34e7ccebad0f0f4713 120000 (symlink)
--- a/wasa/currentRelease
+++ b/wasa/currentRelease
@@ -1 +1 @@
-../tdc_releases/tdc_v2.0
\ No newline at end of file
+../tdc_releases/tdc_v2.1.1
\ No newline at end of file

diff --git a/wasa/tdc_release b/wasa/tdc_release
index 43154c7d300a5b501f6e9fa8128a3d0cf528fa71..02a0ff9ca11f00331804ea34e7ccebad0f0f4713 120000 (symlink)
--- a/wasa/tdc_release
+++ b/wasa/tdc_release
@@ -1 +1 @@
-../tdc_releases/tdc_v2.0
\ No newline at end of file
+../tdc_releases/tdc_v2.1.1
\ No newline at end of file