From c6b7b66ebc2e1832f70313b1aadffe992f7659b6 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Wed, 24 Apr 2024 22:06:45 +0200 Subject: [PATCH] added pedestalmode switch --- slic/core/acquisition/broker/brokerclient.py | 4 ++-- slic/core/acquisition/broker/pedestal.py | 6 +++--- slic/core/acquisition/broker/restapi.py | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/slic/core/acquisition/broker/brokerclient.py b/slic/core/acquisition/broker/brokerclient.py index c3cb34cf..18ab994f 100644 --- a/slic/core/acquisition/broker/brokerclient.py +++ b/slic/core/acquisition/broker/brokerclient.py @@ -137,8 +137,8 @@ class BrokerClient: return "idle" - def take_pedestal(self, detectors=None, rate=None): - take_pedestal(self.address, self.config, detectors=detectors, rate=rate) + def take_pedestal(self, detectors=None, rate=None, pedestalmode=False): + take_pedestal(self.address, self.config, detectors=detectors, rate=rate, pedestalmode=pedestalmode) def power_on(self, detectors=None, **kwargs): diff --git a/slic/core/acquisition/broker/pedestal.py b/slic/core/acquisition/broker/pedestal.py index e2e57c34..04ad15b0 100644 --- a/slic/core/acquisition/broker/pedestal.py +++ b/slic/core/acquisition/broker/pedestal.py @@ -11,7 +11,7 @@ from .tools import get_endstation #TODO: this needs work -def take_pedestal(address, config, detectors=None, rate=None): +def take_pedestal(address, config, detectors=None, rate=None, pedestalmode=False): if detectors is None: detectors = config.detectors @@ -38,8 +38,8 @@ def take_pedestal(address, config, detectors=None, rate=None): n_pulses = 5000 # this is a constant on the broker side timeout = 10 + n_pulses / 100 * rate_multiplicator - print(f"posting:\n{detectors}\npgroup: {pgroup}\nrate_multiplicator: {rate_multiplicator}") - response = restapi.take_pedestal(address, pgroup, detectors, rate_multiplicator=rate_multiplicator, timeout=timeout) + print(f"posting:\n{detectors}\npgroup: {pgroup}\nrate_multiplicator: {rate_multiplicator}\npedestalmode: {pedestalmode}") + response = restapi.take_pedestal(address, pgroup, detectors, rate_multiplicator=rate_multiplicator, pedestalmode=pedestalmode, timeout=timeout) print("done, got:", response) # print(f"waiting for {timeout} seconds") diff --git a/slic/core/acquisition/broker/restapi.py b/slic/core/acquisition/broker/restapi.py index 1a850847..182d7752 100644 --- a/slic/core/acquisition/broker/restapi.py +++ b/slic/core/acquisition/broker/restapi.py @@ -62,11 +62,12 @@ def close_pgroup(address, pgroup, *args, **kwargs): response = post_request(address, "close_pgroup_writing", params, *args, **kwargs) return response.get("message") -def take_pedestal(address, pgroup, detectors, *args, rate_multiplicator=1, **kwargs): +def take_pedestal(address, pgroup, detectors, *args, rate_multiplicator=1, pedestalmode=False, **kwargs): params = { "pgroup": pgroup, "detectors": detectors, - "rate_multiplicator": rate_multiplicator + "rate_multiplicator": rate_multiplicator, + "pedestalmode": pedestalmode } response = post_request(address, "take_pedestal", params, *args, **kwargs) return response.get("message")