From 1bc91cabd4812ba724dac506eee9cba6064aed5c Mon Sep 17 00:00:00 2001 From: NichtJens Date: Fri, 10 Oct 2025 11:10:12 +0200 Subject: [PATCH] renamed DETECTOR_TXNDELAY_FRAME -> DETECTOR_TXDELAY_FRAME --- sf_daq_broker/detector/detector_config.py | 8 ++++---- sf_daq_broker/detector/detector_consts.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sf_daq_broker/detector/detector_config.py b/sf_daq_broker/detector/detector_config.py index 1609e60..2209160 100644 --- a/sf_daq_broker/detector/detector_config.py +++ b/sf_daq_broker/detector/detector_config.py @@ -1,6 +1,6 @@ from sf_daq_broker.utils import json_load -from .detector_consts import BEAMLINE_DELAY, BEAMLINE_VLAN, DAQ_BEAMLINE, DAQ_MAC, DETECTOR_DAQ, DETECTOR_HOSTNAME, DETECTOR_TEMP_THRESHOLD, DETECTOR_TEMP_THRESHOLD_DEFAULT, DETECTOR_TXNDELAY_FRAME +from .detector_consts import BEAMLINE_DELAY, BEAMLINE_VLAN, DAQ_BEAMLINE, DAQ_MAC, DETECTOR_DAQ, DETECTOR_HOSTNAME, DETECTOR_TEMP_THRESHOLD, DETECTOR_TEMP_THRESHOLD_DEFAULT, DETECTOR_TXDELAY_FRAME def make_udp_srcip(detectors, start=0): @@ -81,7 +81,7 @@ class DetectorConfig(): if name not in DETECTOR_TEMP_THRESHOLD: raise_missing("temp_threshold") - if name not in DETECTOR_TXNDELAY_FRAME: + if name not in DETECTOR_TXDELAY_FRAME: raise_missing("txndelay") n_tiles = self.get_number_modules() @@ -91,7 +91,7 @@ class DetectorConfig(): if n_hostnames != n_tiles: raise RuntimeError(f"length {n_hostnames} of configured hostnames {hostnames} does not match number of tiles ({n_tiles}) of detector {name}") - txndelays = DETECTOR_TXNDELAY_FRAME[name] + txndelays = DETECTOR_TXDELAY_FRAME[name] n_txndelays = len(txndelays) if n_txndelays != n_tiles: raise RuntimeError(f"length {n_txndelays} of configured txndelay {txndelays} does not match number of tiles ({n_tiles}) of detector {name}") @@ -157,7 +157,7 @@ class DetectorConfig(): def get_txndelay(self): - txndelays = DETECTOR_TXNDELAY_FRAME[self.name] + txndelays = DETECTOR_TXDELAY_FRAME[self.name] return dict(enumerate(txndelays)) diff --git a/sf_daq_broker/detector/detector_consts.py b/sf_daq_broker/detector/detector_consts.py index b3c409d..0a0bc2f 100644 --- a/sf_daq_broker/detector/detector_consts.py +++ b/sf_daq_broker/detector/detector_consts.py @@ -99,7 +99,7 @@ DETECTOR_HOSTNAME = { "JF20T01V01" : ["jf20-00"] } -DETECTOR_TXNDELAY_FRAME = { +DETECTOR_TXDELAY_FRAME = { "JF01T03V01" : [9, 9, 9], "JF02T09V03" : [7, 7, 7, 7, 8, 8, 8, 8, 9], "JF03T01V02" : [9],