From e2f42463d57b57445945818ca755360ee0d8ddcc Mon Sep 17 00:00:00 2001
From: David Hammer <dhammer@mailbox.org>
Date: Wed, 17 Nov 2021 23:36:00 +0100
Subject: [PATCH] Adding integration time for AGIPD
---
src/calng/calcat_utils.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/calng/calcat_utils.py b/src/calng/calcat_utils.py
index 032dcad4..57f955a5 100644
--- a/src/calng/calcat_utils.py
+++ b/src/calng/calcat_utils.py
@@ -593,7 +593,7 @@ class AgipdCalcatFriend(BaseCalcatFriend):
.reconfigurable()
.commit(),
DOUBLE_ELEMENT(schema)
- .key(f"{param_prefix}.integrationtime")
+ .key(f"{param_prefix}.integrationTime")
.assignmentOptional()
.defaultValue(12)
.reconfigurable()
@@ -602,6 +602,7 @@ class AgipdCalcatFriend(BaseCalcatFriend):
managed_keys.add(f"{param_prefix}.acquisitionRate")
managed_keys.add(f"{param_prefix}.gainSetting")
managed_keys.add(f"{param_prefix}.photonEnergy")
+ managed_keys.add(f"{param_prefix}.integrationTime")
_add_status_schema_from_enum(schema, status_prefix, AgipdConstants)
@@ -613,6 +614,9 @@ class AgipdCalcatFriend(BaseCalcatFriend):
res["Pixels Y"] = self._get_param("pixelsY")
res["Acquisition rate"] = self._get_param("acquisitionRate")
# TODO: make configurable whether or not to include gain setting?
+ integration_time = self._get_param("integrationTime")
+ if integration_time != 12:
+ res["Integration Time"] = integration_time
res["Gain Setting"] = self._get_param("gainSetting")
return res
@@ -624,8 +628,10 @@ class AgipdCalcatFriend(BaseCalcatFriend):
res["Pixels Y"] = self._get_param("pixelsY")
res["Source Energy"] = self._get_param("photonEnergy")
res["Acquisition rate"] = self._get_param("acquisitionRate")
+ integration_time = self._get_param("integrationTime")
+ if integration_time != 12:
+ res["Integration Time"] = integration_time
res["Gain Setting"] = self._get_param("gainSetting")
- # TODO: integration time (omit if 12)
return res
--
GitLab