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

removed "moving" (since adjustables are not only motors): renamed move_back_to_initial_values -> return_to_initial_values

Browse Source
This commit is contained in:
augustin_s
2020-10-11 20:31:43 +02:00
parent bc72deb246
commit 36cabeb6b0
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slic/core/scanner/scanbackend.py
+8 -8
View File
@@ -10,7 +10,7 @@ from .scaninfo import ScanInfo
class ScanBackend:
def __init__(self, adjustables, values, acquisitions, filename, detectors, channels, pvs, n_pulses, data_base_dir, scan_info_dir, make_scan_sub_dir, condition, move_back_to_initial_values):
def __init__(self, adjustables, values, acquisitions, filename, detectors, channels, pvs, n_pulses, data_base_dir, scan_info_dir, make_scan_sub_dir, condition, return_to_initial_values):
self.adjustables = adjustables
self.values = values
self.acquisitions = acquisitions
@@ -29,8 +29,8 @@ class ScanBackend:
self.make_scan_sub_dir = make_scan_sub_dir
self.condition = condition
check_trinary(move_back_to_initial_values)
self.move_back_to_initial_values = move_back_to_initial_values
check_trinary(return_to_initial_values)
self.return_to_initial_values = return_to_initial_values
self.store_initial_values()
@@ -52,13 +52,13 @@ class ScanBackend:
print(t)
print()
move_back = self.move_back_to_initial_values
go_back = self.return_to_initial_values
if move_back is None:
move_back = ask_Yes_no("Move back to initial values")
if go_back is None:
go_back = ask_Yes_no("Return to initial values")
if move_back:
print("Moving back to initial values")
if go_back:
print("Returning to initial values")
self.change_to_initial_values()
slic/core/scanner/scanner.py
+3 -3
View File
@@ -39,7 +39,7 @@ class Scanner:
#TODO: detectors and pvs only for sf_daq
def make_scan(self, adjustables, positions, n_pulses, filename, detectors=None, channels=None, pvs=None, acquisitions=(), start_immediately=True, step_info=None, move_back_to_initial_values=None):
def make_scan(self, adjustables, positions, n_pulses, filename, detectors=None, channels=None, pvs=None, acquisitions=(), start_immediately=True, step_info=None, return_to_initial_values=None):
"""N-dimensional scan
Parameters:
@@ -50,7 +50,7 @@ class Scanner:
acquisitions (sequence of BaseAcquisitions, optional): List of acquisition objects to acquire from. If empty (default) the default list will be used.
start_immediately (bool, optional): If True (default), start the scan immediately. If False, the returned scan can be started via its run method.
step_info: Arbitraty data that is appended to the ScanInfo in each step.
move_back_to_initial_values: (bool or None, optional): Move back to initial values after scan. If None (default) ask for user input.
return_to_initial_values: (bool or None, optional): Return to initial values after scan. If None (default) ask for user input.
Returns:
ScanBackend: Scan instance.
@@ -62,7 +62,7 @@ class Scanner:
acquisitions = self.default_acquisitions
#TODO: detectors and pvs only for sf_daq
scan = ScanBackend(adjustables, positions, acquisitions, filename, detectors, channels, pvs, n_pulses=n_pulses, data_base_dir=self.data_base_dir, scan_info_dir=self.scan_info_dir, make_scan_sub_dir=self.make_scan_sub_dir, condition=self.condition, move_back_to_initial_values=move_back_to_initial_values)
scan = ScanBackend(adjustables, positions, acquisitions, filename, detectors, channels, pvs, n_pulses=n_pulses, data_base_dir=self.data_base_dir, scan_info_dir=self.scan_info_dir, make_scan_sub_dir=self.make_scan_sub_dir, condition=self.condition, return_to_initial_values=return_to_initial_values)
if start_immediately:
scan.run(step_info=step_info)