Skip to content
Snippets Groups Projects
Commit e2f42463 authored by David Hammer's avatar David Hammer
Browse files

Adding integration time for AGIPD

parent 15d2116f
No related branches found
No related tags found
2 merge requests!12Snapshot: field test deployed version as of end of run 202201,!3Base correction device, CalCat interaction, DSSC and AGIPD devices
...@@ -593,7 +593,7 @@ class AgipdCalcatFriend(BaseCalcatFriend): ...@@ -593,7 +593,7 @@ class AgipdCalcatFriend(BaseCalcatFriend):
.reconfigurable() .reconfigurable()
.commit(), .commit(),
DOUBLE_ELEMENT(schema) DOUBLE_ELEMENT(schema)
.key(f"{param_prefix}.integrationtime") .key(f"{param_prefix}.integrationTime")
.assignmentOptional() .assignmentOptional()
.defaultValue(12) .defaultValue(12)
.reconfigurable() .reconfigurable()
...@@ -602,6 +602,7 @@ class AgipdCalcatFriend(BaseCalcatFriend): ...@@ -602,6 +602,7 @@ class AgipdCalcatFriend(BaseCalcatFriend):
managed_keys.add(f"{param_prefix}.acquisitionRate") managed_keys.add(f"{param_prefix}.acquisitionRate")
managed_keys.add(f"{param_prefix}.gainSetting") managed_keys.add(f"{param_prefix}.gainSetting")
managed_keys.add(f"{param_prefix}.photonEnergy") managed_keys.add(f"{param_prefix}.photonEnergy")
managed_keys.add(f"{param_prefix}.integrationTime")
_add_status_schema_from_enum(schema, status_prefix, AgipdConstants) _add_status_schema_from_enum(schema, status_prefix, AgipdConstants)
...@@ -613,6 +614,9 @@ class AgipdCalcatFriend(BaseCalcatFriend): ...@@ -613,6 +614,9 @@ class AgipdCalcatFriend(BaseCalcatFriend):
res["Pixels Y"] = self._get_param("pixelsY") res["Pixels Y"] = self._get_param("pixelsY")
res["Acquisition rate"] = self._get_param("acquisitionRate") res["Acquisition rate"] = self._get_param("acquisitionRate")
# TODO: make configurable whether or not to include gain setting? # 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") res["Gain Setting"] = self._get_param("gainSetting")
return res return res
...@@ -624,8 +628,10 @@ class AgipdCalcatFriend(BaseCalcatFriend): ...@@ -624,8 +628,10 @@ class AgipdCalcatFriend(BaseCalcatFriend):
res["Pixels Y"] = self._get_param("pixelsY") res["Pixels Y"] = self._get_param("pixelsY")
res["Source Energy"] = self._get_param("photonEnergy") res["Source Energy"] = self._get_param("photonEnergy")
res["Acquisition rate"] = self._get_param("acquisitionRate") 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") res["Gain Setting"] = self._get_param("gainSetting")
# TODO: integration time (omit if 12)
return res return res
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment