Merge branch 'epix-fix-input-data-shape' into 'master'

pnCCD and ePix: Fix input data shape if DAQ sends something funny

See merge request !107

src/calng/corrections/Epix100Correction.py

@@ -213,12 +213,9 @@ class Epix100CpuRunner(base_kernel_runner.BaseKernelRunner):
         if config.has("corrections.commonMode.enableBlock"):
             self._cm_block = config["corrections.commonMode.enableBlock"]
 
-    def expected_input_data_shape(self, num_frames):
-        assert num_frames == 1
-        return (
-            self.num_pixels_ss,
-            self.num_pixels_fs,
-        )
+    def expected_input_shape(self, num_frames):
+        assert num_frames == 1, "ePix not expected to have multiple frames"
+        return (self.num_pixels_ss, self.num_pixels_fs)
 
     def _expected_output_shape(self, num_frames):
         return (self.num_pixels_ss, self.num_pixels_fs)
@@ -393,6 +390,10 @@ class Epix100Correction(base_correction.BaseCorrection):
 
     def _get_data_from_hash(self, data_hash):
         image_data = data_hash.get(self._image_data_path)
+        if self.unsafe_get("workarounds.overrideInputAxisOrder"):
+            expected_shape = self.kernel_runner.expected_input_shape(1)
+            if expected_shape != image_data.shape:
+                image_data.shape = expected_shape
         return (
             1,
             image_data,

src/calng/corrections/PnccdCorrection.py

@@ -390,6 +390,10 @@ class PnccdCorrection(base_correction.BaseCorrection):
 
     def _get_data_from_hash(self, data_hash):
         image_data = data_hash.get(self._image_data_path)
+        if self.unsafe_get("workarounds.overrideInputAxisOrder"):
+            expected_shape = self.kernel_runner.expected_input_shape(1)
+            if expected_shape != image_data.shape:
+                image_data.shape = expected_shape
         return (
             1,
             image_data,