Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Asztuc/triggerbuffer resize #520

Open
wants to merge 3 commits into
base: patch/fddaq-v4.4.x
Choose a base branch
from
Open

Asztuc/triggerbuffer resize #520

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fefff9f
Resizing default trigger buffers to be more reasonable
ArturSztuc Jul 29, 2024
b00d0e6
Merge branch 'patch/fddaq-v4.4.x' into asztuc/triggerbuffer_resize
ArturSztuc Oct 11, 2024
b1ab0b7
Fixing the queue from TATee to TABuffer
ArturSztuc Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions python/daqconf/apps/trigger_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ def make_moo_record(conf_dict,name,path='temptypes'):
moo.otypes.make_type(schema='record', fields=fields, name=name, path=path)

#===============================================================================
def get_buffer_conf(source_id, data_request_timeout):
return bufferconf.Conf(latencybufferconf = readoutconf.LatencyBufferConf(latency_buffer_size = 10_000_000),
requesthandlerconf = readoutconf.RequestHandlerConf(latency_buffer_size = 10_000_000,
def get_buffer_conf(source_id, buffer_size, data_request_timeout):
return bufferconf.Conf(latencybufferconf = readoutconf.LatencyBufferConf(latency_buffer_size = buffer_size),
requesthandlerconf = readoutconf.RequestHandlerConf(latency_buffer_size = buffer_size,
pop_limit_pct = 0.8,
pop_size_pct = 0.1,
source_id = source_id,
Expand Down Expand Up @@ -252,7 +252,7 @@ def get_trigger_app(
# We always have a TC buffer even when there are no TPs, because we want to put the timing TC in the output file
modules += [DAQModule(name = 'tc_buf',
plugin = 'TCBuffer',
conf = get_buffer_conf(TC_SOURCE_ID["source_id"], DATA_REQUEST_TIMEOUT))]
conf = get_buffer_conf(TC_SOURCE_ID["source_id"], 50_000, DATA_REQUEST_TIMEOUT))]
if USE_HSI_INPUT:
modules += [DAQModule(name = 'tctee_t',
plugin = 'TCTee')]
Expand Down Expand Up @@ -358,16 +358,7 @@ def get_trigger_app(
DAQModule(name = f'ta_buf_{region_id}_{plane}',
plugin = 'TABuffer',
# PAR 2022-04-20 Not sure what to set the element id to so it doesn't collide with the region/element used by TP buffers. Make it some big number that shouldn't already be used by the TP buffer
conf = bufferconf.Conf(latencybufferconf = readoutconf.LatencyBufferConf(latency_buffer_size = 100_000),
requesthandlerconf = readoutconf.RequestHandlerConf(latency_buffer_size = 100_000,
pop_limit_pct = 0.8,
pop_size_pct = 0.1,
source_id = ta_conf["source_id"],
det_id = 1,
# output_file = f"output_{idx + MIN_LINK}.out",
stream_buffer_size = 8388608,
request_timeout_ms = DATA_REQUEST_TIMEOUT,
enable_raw_recording = False)))]
conf = get_buffer_conf(ta_conf["source_id"], 10_000, DATA_REQUEST_TIMEOUT))]

if(num_algs > 1):
modules += [DAQModule(name = f'tpsettee_ma_{region_id}_{plane}',
Expand Down