sf-daq/sf_daq_broker
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_broker.git synced 2026-08-04 12:32:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

renamed DETECTOR_TXNDELAY_FRAME -> DETECTOR_TXDELAY_FRAME

Browse Source
This commit is contained in:
NichtJens
2025-10-10 11:10:12 +02:00
parent 2655f696f8
commit 1bc91cabd4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sf_daq_broker/detector/detector_config.py
+4 -4
View File
@@ -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))
sf_daq_broker/detector/detector_consts.py
+1 -1
View File
@@ -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],