Expose more coordinates to be exported.

Author: YooSunYoung

src/ess/nmx/mcstas/xml.py

@@ -212,6 +212,11 @@ def num_fast_pixels_per_row(self) -> int:
         """Number of pixels in each row of the detector along the fast axis."""
         return self.num_x if self.fast_axis_name == 'x' else self.num_y
 
+    @property
+    def detector_shape(self) -> tuple:
+        """Shape of the detector panel. (num_x, num_y)"""
+        return (self.num_x, self.num_y)
+
 
 def _collect_detector_descriptions(tree: _XML) -> tuple[DetectorDesc, ...]:
     """Retrieve detector geometry descriptions from mcstas file."""
@@ -392,6 +397,9 @@ def to_coords(self, *det_names: str) -> dict[str, sc.Variable]:
         slow_axes = [det.slow_axis for det in detectors]
         fast_axes = [det.fast_axis for det in detectors]
         origins = [self.sample.position_from_sample(det.position) for det in detectors]
+        detector_shapes = [sc.scalar(det.detector_shape) for det in detectors]
+        x_pixel_sizes = [det.step_x for det in detectors]
+        y_pixel_sizes = [det.step_y for det in detectors]
         return {
             'pixel_id': _construct_pixel_ids(detectors),
             'fast_axis': sc.concat(fast_axes, 'panel'),
@@ -401,6 +409,9 @@ def to_coords(self, *det_names: str) -> dict[str, sc.Variable]:
             'source_position': self.sample.position_from_sample(self.source.position),
             'sample_name': sc.scalar(self.sample.name),
             'position': _detector_pixel_positions(detectors, self.sample),
+            'detector_shape': sc.concat(detector_shapes, 'panel'),
+            'x_pixel_size': sc.concat(x_pixel_sizes, 'panel'),
+            'y_pixel_size': sc.concat(y_pixel_sizes, 'panel'),
         }
 
 

src/ess/nmx/nexus.py

@@ -164,7 +164,7 @@ def _add_lauetof_instrument(nx_entry: h5py.Group):
 
 
 def _add_lauetof_detector_group(dg: sc.DataGroup, nx_instrument: h5py.Group) -> None:
-    nx_detector = nx_instrument.create_group(dg["name"])  # Detector name
+    nx_detector = nx_instrument.create_group(dg["name"].value)  # Detector name
     nx_detector.attrs["NX_class"] = "NXdetector"
     # Polar angle
     _create_dataset_from_var(
@@ -181,22 +181,19 @@ def _add_lauetof_detector_group(dg: sc.DataGroup, nx_instrument: h5py.Group) ->
     # Data - shape: [n_x_pixels, n_y_pixels, n_tof_bins]
     # The actual application definition defines it as integer,
     # but we keep the original data type for now
+    num_x, num_y = dg["detector_shape"].values[0]  # Probably better way to do this...
     _create_dataset_from_var(
         name="data",
         root_entry=nx_detector,
-        var=sc.scalar(0, unit=''),  # TODO: Add real data
+        var=sc.fold(dg["counts"].data, dim='id', sizes={'x': num_x, 'y': num_y}),
     )
     # x_pixel_size
     _create_dataset_from_var(
-        name="x_pixel_size",
-        root_entry=nx_detector,
-        var=sc.scalar(0, unit='mm'),  # TODO: Add real data
+        name="x_pixel_size", root_entry=nx_detector, var=dg["x_pixel_size"]
     )
     # y_pixel_size
     _create_dataset_from_var(
-        name="y_pixel_size",
-        root_entry=nx_detector,
-        var=sc.scalar(0, unit='mm'),  # TODO: Add real data
+        name="y_pixel_size", root_entry=nx_detector, var=dg["y_pixel_size"]
     )
     # distance
     _create_dataset_from_var(
@@ -208,7 +205,7 @@ def _add_lauetof_detector_group(dg: sc.DataGroup, nx_instrument: h5py.Group) ->
     _create_dataset_from_var(
         name="time_of_flight",
         root_entry=nx_detector,
-        var=sc.scalar(0, unit='s'),  # TODO: Add real data
+        var=sc.midpoints(dg["counts"].coords['t']),
         # It should be actual time of flight values of each bin
         # Not sure if it should be median/mean of the bin or bin edges
     )
@@ -274,6 +271,7 @@ def export_panel_independent_data_as_nxlauetof(
         _add_lauetof_definition(nx_entry)
         _add_lauetof_instrument(nx_entry)
         _add_lauetof_sample_group(data, nx_entry)
+        # Placeholder for ``monitor`` group
         _add_lauetof_monitor_group(data, nx_entry)
         # Skipping ``name`` field
 
@@ -288,10 +286,12 @@ def export_panel_dependent_data_as_nxlauetof(
 
 
 def export_as_nxlauetof(
-    data: sc.DataGroup, output_file: str | pathlib.Path | io.BytesIO
+    dg: sc.DataGroup, *dgs: sc.DataGroup, output_file: str | pathlib.Path | io.BytesIO
 ) -> None:
     """Export the reduced data into a nxlauetof format.
 
     Exporting step is not expected to be part of sciline pipelines.
     """
-    export_panel_independent_data_as_nxlauetof(data, output_file)
+
+    export_panel_independent_data_as_nxlauetof(dg, output_file)
+    export_panel_dependent_data_as_nxlauetof(dg, *dgs, output_file=output_file)