RollingDetectorView now works with any detector_number

Author: SimonHeybrock

src/ess/reduce/live/raw.py

@@ -175,10 +175,8 @@ def __init__(self, detector_number: sc.Variable):
         self._start = int(self._flat_detector_number[0].value)
         self._stop = int(self._flat_detector_number[-1].value)
         self._size = int(self._flat_detector_number.size)
-        if not sc.issorted(self._flat_detector_number, dim='event_id'):
-            raise ValueError("Detector numbers must be sorted.")
-        if self._stop - self._start + 1 != self._size:
-            raise ValueError("Detector numbers must be consecutive.")
+        self._sorted = sc.issorted(self._flat_detector_number, dim='event_id')
+        self._consecutive = self._stop - self._start + 1 == self._size
 
     @property
     def detector_number(self) -> sc.Variable:
@@ -189,6 +187,10 @@ def data(self) -> sc.DataArray:
         return self._data
 
     def bincount(self, data: Sequence[int]) -> sc.DataArray:
+        if not self._sorted:
+            raise ValueError("Detector numbers must be sorted to use `bincount`.")
+        if not self._consecutive:
+            raise ValueError("Detector numbers must be consecutive to use `bincount`.")
         offset = np.asarray(data, dtype=np.int32) - self._start
         # Ignore events with detector numbers outside the range of the detector. This
         # should not happen in valid files but for now it is useful until we are sure
@@ -242,7 +244,7 @@ def __init__(
         self._history: sc.DataArray | None = None
         self._cache: sc.DataArray | None = None
 
-        counts = self.bincount([])
+        counts = sc.zeros_like(self.data)
         if self._projection is not None:
             counts = self._projection(counts)
         self._history = (

tests/live/raw_test.py

@@ -27,6 +27,20 @@ def test_Detector_bincount_drops_out_of_range_ids() -> None:
     )
 
 
+def test_Detector_bincount_raises_if_detector_number_not_sorted() -> None:
+    detector_number = sc.array(dims=['pixel'], values=[1, 3, 2], unit=None)
+    det = raw.Detector(detector_number)
+    with pytest.raises(ValueError, match="sorted"):
+        det.bincount([1])
+
+
+def test_Detector_bincount_raises_if_detector_number_not_consecutive() -> None:
+    detector_number = sc.array(dims=['pixel'], values=[1, 2, 4], unit=None)
+    det = raw.Detector(detector_number)
+    with pytest.raises(ValueError, match="consecutive"):
+        det.bincount([1])
+
+
 def test_RollingDetectorView_full_window() -> None:
     detector_number = sc.array(dims=['pixel'], values=[1, 2, 3], unit=None)
     det = raw.RollingDetectorView(detector_number=detector_number, window=2)
@@ -43,6 +57,26 @@ def test_RollingDetectorView_full_window() -> None:
     assert det.get().sum().value == 2
 
 
+def test_RollingDetectorView_add_events_accepts_unsorted_detector_number() -> None:
+    detector_number = sc.array(dims=['detector_number'], values=[1, 3, 2], unit=None)
+    det = raw.RollingDetectorView(detector_number=detector_number, window=2)
+    pixel = sc.array(dims=['event'], values=[1, 2, 3, 2], unit=None)
+    events = sc.DataArray(sc.ones_like(pixel), coords={'detector_number': pixel})
+    det.add_events(events.group(detector_number))
+    assert det.get().sum().value == 4
+
+
+def test_RollingDetectorView_add_events_accepts_non_consecutive_detector_number() -> (
+    None
+):
+    detector_number = sc.array(dims=['detector_number'], values=[1, 2, 4], unit=None)
+    det = raw.RollingDetectorView(detector_number=detector_number, window=2)
+    pixel = sc.array(dims=['event'], values=[1, 2, 4, 2], unit=None)
+    events = sc.DataArray(sc.ones_like(pixel), coords={'detector_number': pixel})
+    det.add_events(events.group(detector_number))
+    assert det.get().sum().value == 4
+
+
 def test_RollingDetectorView_partial_window() -> None:
     detector_number = sc.array(dims=['pixel'], values=[1, 2, 3], unit=None)
     det = raw.RollingDetectorView(detector_number=detector_number, window=3)