tligui_y/slic
0
0
Fork 0
forked from slic/slic
Code Pull Requests Actions Wiki Activity

correct_n_pulses takes rate_multiplicator into account

Browse Source
This commit is contained in:
augustin_s
2023-07-29 18:15:52 +02:00
parent 1595ba87d9
commit 01c368c857
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slic/gui/daqpanels/run.py
+1 -1
View File
@@ -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
slic/gui/daqpanels/scan.py
+1 -1
View File
@@ -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()
slic/gui/daqpanels/scan2d.py
+1 -1
View File
@@ -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()
slic/gui/daqpanels/special.py
+1 -1
View File
@@ -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:
slic/gui/daqpanels/static.py
+1 -1
View File
@@ -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)
slic/gui/daqpanels/tools.py
+3 -3
View File
@@ -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