Go back to named regex group for detector name

European-XFEL · Oct 4, 2024 · 56e4f29 · 56e4f29
1 parent 997ae1d
commit 56e4f29
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/extra_data/components.py b/extra_data/components.py
@@ -225,13 +225,12 @@ def _combine_bitfield(ints):
     @classmethod
     def _find_detector_names(cls, data):
         # Find sources matching the pattern (raw or proc) for this detector type
-        raw_re  = re.compile(f'({cls._det_name_pat}){cls._source_raw_pat}')
-        corr_re = re.compile(f'({cls._det_name_pat}){cls._source_corr_pat}')
+        raw_re  = re.compile(f'(?P<detname>{cls._det_name_pat}){cls._source_raw_pat}')
+        corr_re = re.compile(f'(?P<detname>{cls._det_name_pat}){cls._source_corr_pat}')
         detector_names = set()
         for source in data.instrument_sources:
-            m = raw_re.match(source) or corr_re.match(source)
-            if m:
-                detector_names.add(m.group(1))
+            if m := raw_re.match(source) or corr_re.match(source):
+                detector_names.add(m['detname'])
         return detector_names
 
     @classmethod