renamed Jungfrau.N -> Jungfrau.ID

sf_daq_broker/broker_manager_slow.py

@@ -29,7 +29,7 @@ class DetectorManager:
     def get_jfctrl_monitor(self, request, remote_ip):
         detector_name = get_validated_detector_name(request, remote_ip)
 
-        detector_number = parse_det_name(detector_name).N
+        detector_number = parse_det_name(detector_name).ID
         jfctrl = JFCtrl(detector_number)
 
         parameters = jfctrl.get_monitor()

sf_daq_broker/detector/debugger.py

@@ -52,7 +52,7 @@ def parse_name(name):
     if name not in DETECTOR_NAMES:
         printable_detector_names = mk_printable(DETECTOR_NAMES)
         raise ValueError(f"detector name {name} unknown -- choose from: {printable_detector_names}")
-    ID = parse_det_name(name).N
+    ID = parse_det_name(name).ID
     return ID, name
 
 def parse_ID(ID):
@@ -70,7 +70,7 @@ def parse_ID(ID):
 def mk_mapping():
     detector_ID_to_name = defaultdict(list)
     for n in DETECTOR_NAMES:
-        ID = parse_det_name(n).N
+        ID = parse_det_name(n).ID
         detector_ID_to_name[ID].append(n)
     detector_ID_to_name = dict(detector_ID_to_name)
     return detector_ID_to_name

sf_daq_broker/detector/detector.py

@@ -35,7 +35,7 @@ class Detector:
     def __init__(self, name):
         validate_detector_name(name)
         self.name = name
-        self.ID = parse_det_name(name).N
+        self.ID = parse_det_name(name).ID
         self.load_config()
         self.connect()
 

sf_daq_broker/detector/detector_config.py

@@ -101,7 +101,7 @@ class DetectorConfig():
 #        return self.name
 
     def get_number(self):
-        return parse_det_name(self.name).N
+        return parse_det_name(self.name).ID
 
     def get_number_modules(self):
         return parse_det_name(self.name).T

sf_daq_broker/detector/utils.py

@@ -5,7 +5,7 @@ from .detector_config import DAQ_BEAMLINE, DETECTOR_DAQ
 def get_streamvis_address():
     address = {}
     for d in DETECTOR_DAQ:
-        detector_number = parse_det_name(d).N
+        detector_number = parse_det_name(d).ID
         daq = DETECTOR_DAQ[d]["daq"]
         address[d] = f"sf-daq-{daq}:{5000 + detector_number}"
     return address

sf_daq_broker/utils/detname.py

@@ -2,7 +2,7 @@ import re
 from collections import namedtuple
 
 
-Jungfrau = namedtuple("Jungfrau", ("N", "T", "V"))
+Jungfrau = namedtuple("Jungfrau", ("ID", "T", "V"))
 
 PATTERN_DET_NAME = re.compile(r"^JF(\d{2})T(\d{2})V(\d{2})$")