fix: shape and size of the estia detector

Author: jokasimr

docs/user-guide/estia/estia-mcstas-reduction.ipynb

@@ -57,7 +57,7 @@
     "wf[Filename[ReferenceRun]] = estia_mcstas_example('reference')\n",
     "\n",
     "wf[YIndexLimits]  = sc.scalar(35), sc.scalar(64)\n",
-    "wf[ZIndexLimits] = sc.scalar(0), sc.scalar(14 * 32)\n",
+    "wf[ZIndexLimits] = sc.scalar(0), sc.scalar(48 * 32)\n",
     "wf[BeamDivergenceLimits] = sc.scalar(-0.75, unit='deg'), sc.scalar(0.75, unit='deg')\n",
     "wf[WavelengthBins] = sc.geomspace('wavelength', 3.5, 12, 2001, unit='angstrom')\n",
     "wf[QBins] = 1000\n",

src/ess/estia/load.py

@@ -38,11 +38,14 @@ def load_mcstas_events(
         unit=da.coords['sample_rotation'].unit
     )
 
-    xbins = sc.linspace('x', -0.25, 0.25, 14 * 32 + 1)
-    ybins = sc.linspace('y', -0.25, 0.25, 65)
-    da = da.bin(x=xbins, y=ybins).rename_dims({'y': 'stripe'})
-    da.coords['stripe'] = sc.arange('stripe', 0, 64)
-    da.coords['z_index'] = sc.arange('x', 14 * 32 - 1, -1, -1)
+    nblades = 48
+    nwires = 32
+    nstripes = 64
+    xbins = sc.linspace('x', -0.25, 0.25, nblades * nwires + 1)
+    ybins = sc.linspace('y', -0.13, 0.13, nstripes + 1)
+    da = da.bin(y=ybins, x=xbins).rename_dims({'y': 'stripe'})
+    da.coords['stripe'] = sc.arange('stripe', 0, nstripes)
+    da.coords['z_index'] = sc.arange('x', nblades * nwires - 1, -1, -1)
 
     # Information is not available in the mcstas output files, therefore it's hardcoded
     da.coords['sample_position'] = sc.vector([0.264298, -0.427595, 35.0512], unit='m')
@@ -64,7 +67,7 @@ def load_mcstas_events(
         x=sc.midpoints(da.coords['x']) * sc.scalar(1.0, unit='m'),
         y=sc.midpoints(da.coords['y']) * sc.scalar(1.0, unit='m'),
         z=sc.scalar(0.0, unit='m'),
-    )
+    ).transpose(da.dims)
     da.coords['position'] = (
         da.coords['detector_position'] + rotation_by_detector_rotation * position
     )
@@ -82,7 +85,7 @@ def load_mcstas_events(
     )
     da.coords["beam_size"] = sc.scalar(2.0, unit='mm')
 
-    da = da.fold('x', sizes={'blade': 14, 'wire': 32})
+    da = da.fold('x', sizes={'blade': nblades, 'wire': nwires})
     da.bins.coords.pop('L')
     da.bins.coords.pop('t')
     return DetectorData[RunType](da)

tests/estia/mcstas_data_test.py

@@ -37,7 +37,7 @@ def estia_mcstas_pipeline() -> sciline.Pipeline:
     wf[Filename[ReferenceRun]] = estia_mcstas_reference_run()
 
     wf[YIndexLimits] = sc.scalar(35), sc.scalar(64)
-    wf[ZIndexLimits] = sc.scalar(0), sc.scalar(14 * 32)
+    wf[ZIndexLimits] = sc.scalar(0), sc.scalar(48 * 32)
     wf[BeamDivergenceLimits] = sc.scalar(-1.0, unit='deg'), sc.scalar(1.0, unit='deg')
     wf[WavelengthBins] = sc.geomspace('wavelength', 3.5, 12, 2001, unit='angstrom')
     wf[QBins] = sc.geomspace('Q', 0.005, 0.1, 200, unit='1/angstrom')
@@ -79,8 +79,8 @@ def estia_mcstas_pipeline() -> sciline.Pipeline:
 def test_mcstas_compute_reducible_data(estia_mcstas_pipeline: sciline.Pipeline):
     estia_mcstas_pipeline[Filename[SampleRun]] = estia_mcstas_sample_run(11)
     da = estia_mcstas_pipeline.compute(ReducibleData[SampleRun])
-    assert da.dims == ('blade', 'wire', 'stripe')
-    assert da.shape == (14, 32, 64)
+    assert da.dims == ('stripe', 'blade', 'wire')
+    assert da.shape == (64, 48, 32)
     assert 'position' in da.coords
     assert 'sample_rotation' in da.coords
     assert 'detector_rotation' in da.coords