Skip to content
Snippets Groups Projects
Commit 2860b4a1 authored by David Hammer's avatar David Hammer
Browse files

Merge branch 'bud-2024-summer-hotfixes' into 'master'

Hotfixes from BUD summer 2024

See merge request !101
parents 8b4e056b 57008f40
No related branches found
No related tags found
1 merge request!101Hotfixes from BUD summer 2024
...@@ -253,7 +253,7 @@ class BaseKernelRunner: ...@@ -253,7 +253,7 @@ class BaseKernelRunner:
self._output_transpose = None self._output_transpose = None
else: else:
self._output_transpose = misc.transpose_order( self._output_transpose = misc.transpose_order(
("f", "ss", "fs"), order.split("-") ("f", "ss", "fs"), tuple(order.split("-"))
) )
if config.has("corrections.badPixels.maskingValue"): if config.has("corrections.badPixels.maskingValue"):
......
...@@ -346,7 +346,7 @@ class Gotthard2Correction(base_correction.BaseCorrection): ...@@ -346,7 +346,7 @@ class Gotthard2Correction(base_correction.BaseCorrection):
gain_data = np.asarray( gain_data = np.asarray(
data_hash.get("data.gain") data_hash.get("data.gain")
).astype(np.uint8, copy=False) ).astype(np.uint8, copy=False)
num_frames = image_data.shape[0] num_frames = len(data_hash.get("data.frameNumber"))
if self.unsafe_get("workarounds.overrideInputAxisOrder"): if self.unsafe_get("workarounds.overrideInputAxisOrder"):
expected_shape = self.kernel_runner.expected_input_shape(num_frames) expected_shape = self.kernel_runner.expected_input_shape(num_frames)
image_data.shape = expected_shape image_data.shape = expected_shape
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment