essreduce 25.11.0__py3-none-any.whl → 25.11.1__py3-none-any.whl

ess/reduce/nexus/workflow.py

@@ -385,7 +385,11 @@ def get_calibrated_detector(
     # If the NXdetector in the file is not 1-D, we want to match the order of dims.
     # zip_pixel_offsets otherwise yields a vector with dimensions in the order given
     # by the x/y/z offsets.
-    offsets = snx.zip_pixel_offsets(da.coords).transpose(da.dims).copy()
+    offsets = snx.zip_pixel_offsets(da.coords)
+    # Get the dims in the order of the detector data array, but filter out dims that
+    # don't exist in the offsets (e.g. the detector data may have a 'time' dimension).
+    dims = [dim for dim in da.dims if dim in offsets.dims]
+    offsets = offsets.transpose(dims).copy()
     # We use the unit of the offsets as this is likely what the user expects.
     if transform.value.unit is not None and transform.value.unit != '':
         transform_value = transform.value.to(unit=offsets.unit)
@@ -399,7 +403,7 @@ def get_calibrated_detector(
 
 def assemble_detector_data(
     detector: EmptyDetector[RunType],
-    event_data: NeXusData[snx.NXdetector, RunType],
+    neutron_data: NeXusData[snx.NXdetector, RunType],
 ) -> RawDetector[RunType]:
     """
     Assemble a detector data array with event data.
@@ -410,14 +414,15 @@ def assemble_detector_data(
     ----------
     detector:
         Calibrated detector data array.
-    event_data:
-        Event data array.
+    neutron_data:
+        Neutron data array (events or histogram).
     """
-    grouped = nexus.group_event_data(
-        event_data=event_data, detector_number=detector.coords['detector_number']
-    )
+    if neutron_data.bins is not None:
+        neutron_data = nexus.group_event_data(
+            event_data=neutron_data, detector_number=detector.coords['detector_number']
+        )
     return RawDetector[RunType](
-        _add_variances(grouped)
+        _add_variances(neutron_data)
         .assign_coords(detector.coords)
         .assign_masks(detector.masks)
     )
@@ -504,6 +509,19 @@ def _drop(
     }
 
 
+class _EmptyField:
+    """Empty field that can replace a missing detector_number in NXdetector."""
+
+    def __init__(self, sizes: dict[str, int]):
+        self.attrs = {}
+        self.sizes = sizes.copy()
+        self.dims = tuple(sizes.keys())
+        self.shape = tuple(sizes.values())
+
+    def __getitem__(self, key: Any) -> sc.Variable:
+        return sc.zeros(dims=self.dims, shape=self.shape, unit=None, dtype='int32')
+
+
 class _StrippedDetector(snx.NXdetector):
     """Detector definition without large geometry or event data for ScippNexus.
 
@@ -513,8 +531,36 @@ class _StrippedDetector(snx.NXdetector):
     def __init__(
         self, attrs: dict[str, Any], children: dict[str, snx.Field | snx.Group]
     ):
-        children = _drop(children, (snx.NXoff_geometry, snx.NXevent_data))
-        children['data'] = children['detector_number']
+        if 'detector_number' in children:
+            data = children['detector_number']
+        else:
+            # We get the 'data' sizes before the NXdata is dropped
+            if 'data' not in children:
+                raise KeyError(
+                    "StrippedDetector: Cannot determine shape of the detector. "
+                    "No 'detector_number' was found, and the 'data' entry is missing."
+                )
+            if 'value' not in children['data']:
+                raise KeyError(
+                    "StrippedDetector: Cannot determine shape of the detector. "
+                    "The 'data' entry has no 'value'."
+                )
+            # We drop any time-related dimension from the data sizes, as they are not
+            # relevant for the detector geometry/shape.
+            data = _EmptyField(
+                sizes={
+                    dim: size
+                    for dim, size in children['data']['value'].sizes.items()
+                    if dim not in ('time', 'frame_time')
+                }
+            )
+
+        children = _drop(
+            children, (snx.NXoff_geometry, snx.NXevent_data, snx.NXdata, snx.NXlog)
+        )
+
+        children['data'] = data
+
         super().__init__(attrs=attrs, children=children)
 
 
@@ -528,7 +574,7 @@ class _DummyField:
         self.shape = (0,)
 
     def __getitem__(self, key: Any) -> sc.Variable:
-        return sc.empty(dims=self.dims, shape=self.shape, unit=None)
+        return sc.zeros(dims=self.dims, shape=self.shape, unit=None, dtype='int32')
 
 
 class _StrippedMonitor(snx.NXmonitor):

{essreduce-25.11.0.dist-info → essreduce-25.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: essreduce
-Version: 25.11.0
+Version: 25.11.1
 Summary: Common data reduction tools for the ESS facility
 Author: Scipp contributors
 License-Expression: BSD-3-Clause

{essreduce-25.11.0.dist-info → essreduce-25.11.1.dist-info}/RECORD

@@ -17,7 +17,7 @@ ess/reduce/nexus/_nexus_loader.py,sha256=8jN97CbFaSJ6XZEFzkoeAGyol8WpLTUZsHkUWu8
 ess/reduce/nexus/json_generator.py,sha256=ME2Xn8L7Oi3uHJk9ZZdCRQTRX-OV_wh9-DJn07Alplk,2529
 ess/reduce/nexus/json_nexus.py,sha256=QrVc0p424nZ5dHX9gebAJppTw6lGZq9404P_OFl1giA,10282
 ess/reduce/nexus/types.py,sha256=g5oBBEYPH7urF1tDP0tqXtixhQN8JDpe8vmiKrPiUW0,9320
-ess/reduce/nexus/workflow.py,sha256=6mgvYW69kBtyhzbfZCi-WzJ3VhcKnx9z2qtXTVXH04E,23169
+ess/reduce/nexus/workflow.py,sha256=nU_YzaRJO5yUGNIHVPScJF_oEddZxaA2gChPF9mMhDQ,25031
 ess/reduce/scripts/grow_nexus.py,sha256=hET3h06M0xlJd62E3palNLFvJMyNax2kK4XyJcOhl-I,3387
 ess/reduce/time_of_flight/__init__.py,sha256=Av6Pu_AKO0tF8IsWXchUXjjHps7ts2NFVnui6k3Eq-o,1425
 ess/reduce/time_of_flight/eto_to_tof.py,sha256=aPPQYbbz_73eq5dQCS97q02D2UUFntOfow2lWkkRyxg,14993
@@ -40,9 +40,9 @@ ess/reduce/widgets/_spinner.py,sha256=2VY4Fhfa7HMXox2O7UbofcdKsYG-AJGrsgGJB85nDX
 ess/reduce/widgets/_string_widget.py,sha256=iPAdfANyXHf-nkfhgkyH6gQDklia0LebLTmwi3m-iYQ,1482
 ess/reduce/widgets/_switchable_widget.py,sha256=fjKz99SKLhIF1BLgGVBSKKn3Lu_jYBwDYGeAjbJY3Q8,2390
 ess/reduce/widgets/_vector_widget.py,sha256=aTaBqCFHZQhrIoX6-sSqFWCPePEW8HQt5kUio8jP1t8,1203
-essreduce-25.11.0.dist-info/licenses/LICENSE,sha256=nVEiume4Qj6jMYfSRjHTM2jtJ4FGu0g-5Sdh7osfEYw,1553
-essreduce-25.11.0.dist-info/METADATA,sha256=q1TSHnOhJnGdAOulSP-Z-ML81kytiWoqn7PRpMn7wYM,1937
-essreduce-25.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-essreduce-25.11.0.dist-info/entry_points.txt,sha256=PMZOIYzCifHMTe4pK3HbhxUwxjFaZizYlLD0td4Isb0,66
-essreduce-25.11.0.dist-info/top_level.txt,sha256=0JxTCgMKPLKtp14wb1-RKisQPQWX7i96innZNvHBr-s,4
-essreduce-25.11.0.dist-info/RECORD,,
+essreduce-25.11.1.dist-info/licenses/LICENSE,sha256=nVEiume4Qj6jMYfSRjHTM2jtJ4FGu0g-5Sdh7osfEYw,1553
+essreduce-25.11.1.dist-info/METADATA,sha256=YJBtrUy0Gw60xZHi0TrmkBhC4XroNNC_CIEL0qRD5z8,1937
+essreduce-25.11.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+essreduce-25.11.1.dist-info/entry_points.txt,sha256=PMZOIYzCifHMTe4pK3HbhxUwxjFaZizYlLD0td4Isb0,66
+essreduce-25.11.1.dist-info/top_level.txt,sha256=0JxTCgMKPLKtp14wb1-RKisQPQWX7i96innZNvHBr-s,4
+essreduce-25.11.1.dist-info/RECORD,,