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

Apparently, we in online get an extra dimension compared to what MemToPipe sends. So this broke ePix preview https://redmine.xfel.eu/issues/178017

Maybe I used to squeeze and never noticed this discrepancy. Anyway, forcing input shape to be what it should be ought to straighten this out.

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,

[Philipp Schmidt]

Note that this can raise an exception if the shape product is not identical.

[David Hammer]

Yep, and that will be caught by a warning context in BaseCorrection resulting in a warning for inputDataState.

That warning could be better - it should #56 stop processing so as to not have additional confusing exceptions afterwards, and we can out there specifically watch out for a ValueError arising from failed shape change (currently, it's RuntimeError for empty hash or catch-all unexpected exception). Would review after !99.