From 48c526c4da5d1dd1bc80e76c8fc05bb2ff7de910 Mon Sep 17 00:00:00 2001
From: David Hammer <dhammer@mailbox.org>
Date: Tue, 18 Jan 2022 13:12:05 +0100
Subject: [PATCH] Set more explicit defaults per class
---
src/calng/AgipdCorrection.py | 5 +++++
src/calng/DsscCorrection.py | 5 +++++
src/calng/calcat_utils.py | 10 +++++++++-
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/calng/AgipdCorrection.py b/src/calng/AgipdCorrection.py
index 5511ab8e..7c45081d 100644
--- a/src/calng/AgipdCorrection.py
+++ b/src/calng/AgipdCorrection.py
@@ -348,6 +348,11 @@ class AgipdCalcatFriend(calcat_utils.BaseCalcatFriend):
OVERWRITE_ELEMENT(schema)
.key(f"{param_prefix}.memoryCells")
.setNewDefaultValue(352)
+ .commit(),
+
+ OVERWRITE_ELEMENT(schema)
+ .key(f"{param_prefix}.biasVoltage")
+ .setNewDefaultValue(300)
.commit()
)
diff --git a/src/calng/DsscCorrection.py b/src/calng/DsscCorrection.py
index 4ad37908..4b48e5ae 100644
--- a/src/calng/DsscCorrection.py
+++ b/src/calng/DsscCorrection.py
@@ -123,6 +123,11 @@ class DsscCalcatFriend(calcat_utils.BaseCalcatFriend):
OVERWRITE_ELEMENT(schema)
.key(f"{param_prefix}.memoryCells")
.setNewDefaultValue(400)
+ .commit(),
+
+ OVERWRITE_ELEMENT(schema)
+ .key(f"{param_prefix}.biasVoltage")
+ .setNewDefaultValue(100) # TODO: proper
.commit()
)
(
diff --git a/src/calng/calcat_utils.py b/src/calng/calcat_utils.py
index 0af00de4..cb8a6719 100644
--- a/src/calng/calcat_utils.py
+++ b/src/calng/calcat_utils.py
@@ -248,25 +248,33 @@ class BaseCalcatFriend:
UINT32_ELEMENT(schema)
.key(f"{param_prefix}.memoryCells")
+ .displayedName("Memory cells")
+ .description(
+ "Number of memory cells / frames per train. Relevant for burst mode."
+ )
.assignmentOptional()
- .noDefaultValue()
+ .defaultValue(1)
.reconfigurable()
.commit(),
UINT32_ELEMENT(schema)
.key(f"{param_prefix}.pixelsX")
+ .displayedName("Pixels X")
.assignmentOptional()
.defaultValue(512)
.commit(),
UINT32_ELEMENT(schema)
.key(f"{param_prefix}.pixelsY")
+ .displayedName("Pixels Y")
.assignmentOptional()
.defaultValue(128)
.commit(),
DOUBLE_ELEMENT(schema)
.key(f"{param_prefix}.biasVoltage")
+ .displayedName("Bias voltage")
+ .description("Sensor bias voltage")
.assignmentOptional()
.defaultValue(300)
.reconfigurable()
--
GitLab