Skip to content
Snippets Groups Projects

[AGIPD] as_single_value instead of get_run_value

Merged Karim Ahmed requested to merge fix/get_run_value_AGIPDCtrl into master
+ 6
6
@@ -88,7 +88,7 @@ class AgipdCtrl:
@@ -88,7 +88,7 @@ class AgipdCtrl:
# It is desired to loose precision here because the usage is
# It is desired to loose precision here because the usage is
# about bucketing the rate for managing meta-data.
# about bucketing the rate for managing meta-data.
return round(float(self.run_dc[rep_rate_src].as_single_value()), 1)
return round(float(self.run_dc.get_run_value(*rep_rate_src)), 1)
train_pulses = np.squeeze(
train_pulses = np.squeeze(
self.run_dc[
self.run_dc[
@@ -128,11 +128,11 @@ class AgipdCtrl:
@@ -128,11 +128,11 @@ class AgipdCtrl:
return
return
if "gain.value" in self.run_dc.keys_for_source(self.ctrl_src):
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 self.run_dc.get_run_value(self.ctrl_src, "gain.value")
setupr = self.run_dc[self.ctrl_src, "setupr.value"].as_single_value()
setupr = self.run_dc.get_run_value(self.ctrl_src, "setupr.value")
pattern_type_idx = self.run_dc[
pattern_type_idx = self.run_dc.get_run_value(
self.ctrl_src, "patternTypeIndex.value"].as_single_value()
self.ctrl_src, "patternTypeIndex.value")
if (setupr == 0 and pattern_type_idx < 4) or (
if (setupr == 0 and pattern_type_idx < 4) or (
setupr == 32 and pattern_type_idx == 4):
setupr == 32 and pattern_type_idx == 4):
@@ -194,7 +194,7 @@ class AgipdCtrl:
@@ -194,7 +194,7 @@ class AgipdCtrl:
voltage_src[1] in self.run_dc.keys_for_source(voltage_src[0])
voltage_src[1] in self.run_dc.keys_for_source(voltage_src[0])
):
):
return self.run_dc[voltage_src].as_single_value(atol=1, reduce_by='max')
return self.run_dc.get_run_value(*voltage_src)
else:
else:
print(
print(
"WARNING: Unable to read bias_voltage from"
"WARNING: Unable to read bias_voltage from"
Loading