From 2e4591dd1706529053d48a5a040ff0111a9b535f Mon Sep 17 00:00:00 2001
From: NichtJens <nichtjens@gmail.com>
Date: Fri, 10 Oct 2025 17:25:33 +0200
Subject: [PATCH] renamed Jungfrau.N -> Jungfrau.ID

---
 sf_daq_broker/broker_manager_slow.py      | 2 +-
 sf_daq_broker/detector/debugger.py        | 4 ++--
 sf_daq_broker/detector/detector.py        | 2 +-
 sf_daq_broker/detector/detector_config.py | 2 +-
 sf_daq_broker/detector/utils.py           | 2 +-
 sf_daq_broker/utils/detname.py            | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sf_daq_broker/broker_manager_slow.py b/sf_daq_broker/broker_manager_slow.py
index 6d6c79f..6e4bff1 100644
--- a/sf_daq_broker/broker_manager_slow.py
+++ b/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()
diff --git a/sf_daq_broker/detector/debugger.py b/sf_daq_broker/detector/debugger.py
index 5649e45..eb31154 100644
--- a/sf_daq_broker/detector/debugger.py
+++ b/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
diff --git a/sf_daq_broker/detector/detector.py b/sf_daq_broker/detector/detector.py
index cc835dc..8d0e90d 100644
--- a/sf_daq_broker/detector/detector.py
+++ b/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()
 
diff --git a/sf_daq_broker/detector/detector_config.py b/sf_daq_broker/detector/detector_config.py
index b14b40b..de41e5d 100644
--- a/sf_daq_broker/detector/detector_config.py
+++ b/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
diff --git a/sf_daq_broker/detector/utils.py b/sf_daq_broker/detector/utils.py
index 23e8021..c35dfdd 100644
--- a/sf_daq_broker/detector/utils.py
+++ b/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
diff --git a/sf_daq_broker/utils/detname.py b/sf_daq_broker/utils/detname.py
index f87937d..dd7e280 100644
--- a/sf_daq_broker/utils/detname.py
+++ b/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})$")