From 01c368c8578e81ece67ca974ce9e20f2ffafd414 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Sat, 29 Jul 2023 18:15:52 +0200 Subject: [PATCH] correct_n_pulses takes rate_multiplicator into account --- slic/gui/daqpanels/run.py | 2 +- slic/gui/daqpanels/scan.py | 2 +- slic/gui/daqpanels/scan2d.py | 2 +- slic/gui/daqpanels/special.py | 2 +- slic/gui/daqpanels/static.py | 2 +- slic/gui/daqpanels/tools.py | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/slic/gui/daqpanels/run.py b/slic/gui/daqpanels/run.py index ab57c3e7..efab9b08 100644 --- a/slic/gui/daqpanels/run.py +++ b/slic/gui/daqpanels/run.py @@ -67,7 +67,7 @@ class RunPanel(wx.Panel): n_pulses = int(n_pulses) rate = self.eta.value - n_pulses = correct_n_pulses(rate, n_pulses) + n_pulses = correct_n_pulses(rate, n_pulses, self.acquisition.client.config.rate_multiplicator) continuous = self.cb_contin.IsChecked() n_repeat = None if continuous else 1 diff --git a/slic/gui/daqpanels/scan.py b/slic/gui/daqpanels/scan.py index dcaa42ed..41bc57ea 100644 --- a/slic/gui/daqpanels/scan.py +++ b/slic/gui/daqpanels/scan.py @@ -73,7 +73,7 @@ class ScanPanel(wx.Panel): n_repeat = int(n_repeat) rate = self.eta.value - n_pulses = correct_n_pulses(rate, n_pulses) + n_pulses = correct_n_pulses(rate, n_pulses, self.scanner.default_acquisitions[0].client.config.rate_multiplicator) relative = self.cb_relative.GetValue() return_to_initial_values = self.cb_return.GetValue() diff --git a/slic/gui/daqpanels/scan2d.py b/slic/gui/daqpanels/scan2d.py index 9f74e3d8..cc986e5a 100644 --- a/slic/gui/daqpanels/scan2d.py +++ b/slic/gui/daqpanels/scan2d.py @@ -62,7 +62,7 @@ class Scan2DPanel(wx.Panel): n_repeat = int(n_repeat) rate = self.eta.value - n_pulses = correct_n_pulses(rate, n_pulses) + n_pulses = correct_n_pulses(rate, n_pulses, self.scanner.default_acquisitions[0].client.config.rate_multiplicator) relative1 = self.adjbox1.cb_relative.GetValue() relative2 = self.adjbox2.cb_relative.GetValue() diff --git a/slic/gui/daqpanels/special.py b/slic/gui/daqpanels/special.py index e6f7140b..bf261134 100644 --- a/slic/gui/daqpanels/special.py +++ b/slic/gui/daqpanels/special.py @@ -92,7 +92,7 @@ class SpecialScanPanel(wx.Panel): n_repeat = int(n_repeat) rate = self.eta.value - n_pulses = correct_n_pulses(rate, n_pulses) + n_pulses = correct_n_pulses(rate, n_pulses, self.scanner.default_acquisitions[0].client.config.rate_multiplicator) relative = self.cb_relative.GetValue() if relative: diff --git a/slic/gui/daqpanels/static.py b/slic/gui/daqpanels/static.py index 53424cb6..ac2c4b34 100644 --- a/slic/gui/daqpanels/static.py +++ b/slic/gui/daqpanels/static.py @@ -51,7 +51,7 @@ class StaticPanel(wx.Panel): n_repeat = int(n_repeat) rate = self.eta.value - n_pulses = correct_n_pulses(rate, n_pulses) + n_pulses = correct_n_pulses(rate, n_pulses, self.acquisition.client.config.rate_multiplicator) self.task = self.acquisition.acquire(filename, n_pulses=n_pulses, n_repeat=n_repeat, wait=False) diff --git a/slic/gui/daqpanels/tools.py b/slic/gui/daqpanels/tools.py index f07632dc..b150b6d0 100644 --- a/slic/gui/daqpanels/tools.py +++ b/slic/gui/daqpanels/tools.py @@ -182,13 +182,13 @@ def run(fn): # TODO -def correct_n_pulses(rate, n_pulses): +def correct_n_pulses(rate, n_pulses, rate_multiplicator): if not rate: raise ValueError(f"cannot calculate #Pulses for Rep. Rate = {rate}") - multiplier = NOMINAL_REPRATE / rate + multiplier = NOMINAL_REPRATE / rate / rate_multiplicator n_pulses *= multiplier n_pulses = int(n_pulses) - print(f"rate={rate}, multiplier={multiplier}, n_pulses={n_pulses}") + print(f"rate={rate}, multiplier={multiplier}, n_pulses={n_pulses}, rate_multiplicator={rate_multiplicator}") return n_pulses