diff --git a/src/calng/corrections/Epix100Correction.py b/src/calng/corrections/Epix100Correction.py index cf9e85c134b7ab730ac846d77ad99ec565f1a770..05bc1b7c97ff0a2d64b290b9987625052dffbc84 100644 --- a/src/calng/corrections/Epix100Correction.py +++ b/src/calng/corrections/Epix100Correction.py @@ -140,7 +140,7 @@ class Epix100CalcatFriend(base_calcat.BaseCalcatFriend): class Epix100CpuRunner(base_kernel_runner.BaseKernelRunner): - _corrected_axis_order = "fxy" + _corrected_axis_order = "xy" _xp = np _gpu_based = False @@ -343,6 +343,12 @@ class Epix100Correction(base_correction.BaseCorrection): .setNewDefaultValue(1) .commit(), + OVERWRITE_ELEMENT(expected) + .key("dataFormat.outputAxisOrder") + .setNewOptions("xy,yx") + .setNewDefaultValue("xy") + .commit(), + # TODO: disable preview selection mode OVERWRITE_ELEMENT(expected) diff --git a/src/calng/corrections/PnccdCorrection.py b/src/calng/corrections/PnccdCorrection.py index c1a7ae498a10c1c9b2b43b459842acfda532721b..3350ace74b6f8ed12cc034460f8ac1f947d0bbd7 100644 --- a/src/calng/corrections/PnccdCorrection.py +++ b/src/calng/corrections/PnccdCorrection.py @@ -149,7 +149,7 @@ class PnccdCalcatFriend(base_calcat.BaseCalcatFriend): class PnccdCpuRunner(base_kernel_runner.BaseKernelRunner): - _corrected_axis_order = "fxy" + _corrected_axis_order = "xy" _xp = np _gpu_based = False @@ -348,6 +348,12 @@ class PnccdCorrection(base_correction.BaseCorrection): .setNewDefaultValue(1) .commit(), + OVERWRITE_ELEMENT(expected) + .key("dataFormat.outputAxisOrder") + .setNewOptions("xy,yx") + .setNewDefaultValue("xy") + .commit(), + # TODO: disable preview selection mode OVERWRITE_ELEMENT(expected)