From 621041e45eb52b1c706c84d984a27b7d8fa1f20e Mon Sep 17 00:00:00 2001
From: David Hammer <dhammer@mailbox.org>
Date: Wed, 20 Apr 2022 08:57:51 +0200
Subject: [PATCH] Set default output axis order for DSSC, make reconfigurable
---
src/calng/DsscCorrection.py | 5 +++++
src/calng/base_correction.py | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/src/calng/DsscCorrection.py b/src/calng/DsscCorrection.py
index 81d38e16..7aa604e4 100644
--- a/src/calng/DsscCorrection.py
+++ b/src/calng/DsscCorrection.py
@@ -181,6 +181,11 @@ class DsscCorrection(BaseCorrection):
.setNewDefaultValue(400)
.commit(),
+ OVERWRITE_ELEMENT(expected)
+ .key("dataFormat.outputAxisOrder")
+ .setNewDefaultValue("cyx")
+ .commit(),
+
OVERWRITE_ELEMENT(expected)
.key("preview.selectionMode")
.setNewDefaultValue("pulse")
diff --git a/src/calng/base_correction.py b/src/calng/base_correction.py
index ec264827..4e4f259a 100644
--- a/src/calng/base_correction.py
+++ b/src/calng/base_correction.py
@@ -379,6 +379,7 @@ class BaseCorrection(PythonDevice):
.options("float16,float32,uint16")
.assignmentOptional()
.defaultValue("float32")
+ .reconfigurable()
.commit(),
# important: determines shape of data as going into correction
@@ -426,6 +427,7 @@ class BaseCorrection(PythonDevice):
.options("cxy,cyx,xcy,xyc,ycx,yxc")
.assignmentOptional()
.defaultValue("cxy")
+ .reconfigurable()
.commit(),
VECTOR_UINT32_ELEMENT(expected)
@@ -731,6 +733,8 @@ class BaseCorrection(PythonDevice):
for shape_param in (
"dataFormat.pixelsX",
"dataFormat.pixelsY",
+ "dataFormat.outputImageDtype",
+ "dataFormat.outputAxisOrder",
"dataFormat.memoryCells",
"constantParameters.memoryCells",
"frameFilter",
--
GitLab