From 87ba03401a944519527a3a420e2e36d81dc9ca3a Mon Sep 17 00:00:00 2001
From: Karim Ahmed <karim.ahmed@xfel.eu>
Date: Thu, 28 Apr 2022 16:58:06 +0200
Subject: [PATCH] Use as_single_value for all control parameters, except for
bias_voltage.
---
src/cal_tools/agipdlib.py | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/cal_tools/agipdlib.py b/src/cal_tools/agipdlib.py
index ea077b5a4..fafc7fc8e 100644
--- a/src/cal_tools/agipdlib.py
+++ b/src/cal_tools/agipdlib.py
@@ -27,6 +27,7 @@ from cal_tools.enums import AgipdGainMode, BadPixels, SnowResolution
from cal_tools.h5_copy_except import h5_copy_except_paths
from cal_tools.tools import get_from_db
+
class AgipdCtrl:
def __init__(
self,
@@ -88,7 +89,6 @@ class AgipdCtrl:
# float.
# It is desired to loose precision here because the usage is
# about bucketing the rate for managing meta-data.
-
return round(float(self.run_dc[rep_rate_src].as_single_value()), 1)
train_pulses = np.squeeze(
@@ -129,11 +129,12 @@ class AgipdCtrl:
return
if "gain.value" in self.run_dc.keys_for_source(self.ctrl_src):
- return self.run_dc[self.ctrl_src, "gain.value"].as_single_value()
+ return int(
+ self.run_dc[self.ctrl_src, "gain"].as_single_value())
- setupr = self.run_dc[self.ctrl_src, "setupr.value"].as_single_value()
+ setupr = self.run_dc[self.ctrl_src, "setupr"].as_single_value()
pattern_type_idx = self.run_dc[
- self.ctrl_src, "patternTypeIndex.value"].as_single_value()
+ self.ctrl_src, "patternTypeIndex"].as_single_value()
if (setupr == 0 and pattern_type_idx < 4) or (
setupr == 32 and pattern_type_idx == 4):
@@ -162,9 +163,8 @@ class AgipdCtrl:
"gainModeIndex.value" in self.run_dc.keys_for_source(
self.ctrl_src)
):
- return AgipdGainMode(int(
- self.run_dc.get_run_value(
- self.ctrl_src, "gainModeIndex.value")))
+ return AgipdGainMode(int(self.run_dc[
+ self.ctrl_src, "gainModeIndex"].as_single_value()))
return AgipdGainMode.ADAPTIVE_GAIN
@@ -210,7 +210,7 @@ class AgipdCtrl:
# As HED_DET_AGIPD500K2G has a hardware issue that leads
# to storing arbitrary voltage values in the CONTROL source
# array. e.g. /gpfs/exfel/exp/HED/202230/p900248/raw
- return int(self.run_dc.get_run_value(*voltage_src))
+ return self.run_dc.get_run_value(*voltage_src)
else:
# TODO: Validate if removing this and
# and using NB value for old RAW data.
@@ -237,8 +237,8 @@ class AgipdCtrl:
'integrationTime.value' in self.run_dc.keys_for_source(
self.ctrl_src)
):
- return int(self.run_dc.get_run_value(
- self.ctrl_src, 'integrationTime.value'))
+ return int(self.run_dc[
+ self.ctrl_src, 'integrationTime'].as_single_value())
return 12
--
GitLab