From 053ae4e516eeed7fe10fa73726ecc21ed722aa1e Mon Sep 17 00:00:00 2001 From: Cahit Date: Tue, 3 Feb 2015 12:21:06 +0100 Subject: [PATCH] periph_padiwa is brought up-to-date with tdc_v2.1.1 --- tdc_releases/tdc_v2.1.1/trb3_periph_padiwa.vhd | 4 ++-- wasa/config.vhd | 7 +++++-- wasa/currentRelease | 2 +- wasa/tdc_release | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) 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 9c6420f..da43736 100644 --- 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 96510e5..0bef662 100644 --- 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 43154c7..02a0ff9 120000 --- 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 43154c7..02a0ff9 120000 --- 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 -- 2.43.0