diff --git a/slic/core/acquisition/diaacquisition.py b/slic/core/acquisition/diaacquisition.py index a96c04895..033735ea5 100644 --- a/slic/core/acquisition/diaacquisition.py +++ b/slic/core/acquisition/diaacquisition.py @@ -38,7 +38,7 @@ class DIAAcquisition(BaseAcquisition): self.client = DetectorIntegrationClient(api_address) - def acquire(self, filename=None, channels=None, n_pulses=100, use_default_dir=True, is_HG0=False, **kwargs): + def acquire(self, filename=None, channels=None, n_pulses=100, use_default_dir=True, is_HG0=False): if filename: if use_default_dir: filename = os.path.join(self.default_dir, filename) diff --git a/slic/core/acquisition/pedestals.py b/slic/core/acquisition/pedestals.py index 26f869bb1..d421315a8 100644 --- a/slic/core/acquisition/pedestals.py +++ b/slic/core/acquisition/pedestals.py @@ -96,7 +96,7 @@ def analyze_pedestal_on_cluster(instrument, raw_file_base, res_dir, user=None): cmd = f"sbatch jungfrau_create_pedestals --filename {ped} --directory {res_dir} --verbosity 4" commands.append(cmd) - cmd = "\;".join(commands) + cmd = "; ".join(commands) os.system(cmd) diff --git a/slic/core/acquisition/pvacquisition.py b/slic/core/acquisition/pvacquisition.py index e5bc7405b..ca529ada8 100644 --- a/slic/core/acquisition/pvacquisition.py +++ b/slic/core/acquisition/pvacquisition.py @@ -70,7 +70,7 @@ def make_arrays(pvs, n_pulses): shape = get_shape(val) shape = (n_pulses,) + shape - arr = np.empty(shape, dtype) + arr = np.empty(shape, dtype) arrays.append(arr) return arrays diff --git a/slic/core/acquisition/sfpaths.py b/slic/core/acquisition/sfpaths.py index c919c76a1..08a258e59 100644 --- a/slic/core/acquisition/sfpaths.py +++ b/slic/core/acquisition/sfpaths.py @@ -15,7 +15,7 @@ class SwissFELPaths: # converted: "/sf/alvra/data/p18442/res/JF_pedestals/pedestal_20200202_2046.JF02T09V02.res.h5" # send to DIA: "/sf/alvra/data/p18442/res/JF_pedestals/pedestal_20200202_2046" where ".DETECTOR.res.h5" will be appended - pede_files = pede + "pedestal_*.res.h5" + pede_files = pede + "pedestal_*.res.h5" default_channel_list = instrument + "config/com/channel_lists/default_channel_list" diff --git a/slic/core/scanner/scanbackend.py b/slic/core/scanner/scanbackend.py index 1a43b5a48..0e8046376 100644 --- a/slic/core/scanner/scanbackend.py +++ b/slic/core/scanner/scanbackend.py @@ -1,5 +1,4 @@ import os -import colorama from slic.utils import make_missing_dir from slic.utils.printing import printable_dict diff --git a/slic/core/scanner/scanner.py b/slic/core/scanner/scanner.py index 3216d99fa..9e311cc36 100644 --- a/slic/core/scanner/scanner.py +++ b/slic/core/scanner/scanner.py @@ -13,7 +13,7 @@ def make_positions(start, end, n): class Scanner: - def __init__(self, data_base_dir="", scan_info_dir="", default_acquisitions=[], condition=None, make_scan_sub_dir=True): + def __init__(self, data_base_dir="", scan_info_dir="", default_acquisitions=(), condition=None, make_scan_sub_dir=True): self.data_base_dir = data_base_dir self.scan_info_dir = scan_info_dir self.default_acquisitions = default_acquisitions @@ -23,7 +23,7 @@ class Scanner: self.filename_generator = RunFilenameGenerator(scan_info_dir) - def make_scan(self, adjustables, positions, n_pulses, filename, acquisitions=[], start_immediately=True, step_info=None): + def make_scan(self, adjustables, positions, n_pulses, filename, acquisitions=(), start_immediately=True, step_info=None): filename = self.filename_generator.get_next_run_filename(filename) if not acquisitions: diff --git a/slic/core/task/loop.py b/slic/core/task/loop.py index 1e4722036..3e1cfa3bd 100644 --- a/slic/core/task/loop.py +++ b/slic/core/task/loop.py @@ -34,9 +34,9 @@ class Loop(Task): class TimedLoop(Loop): - def __init__(self, func, max_time, wait_time=0, hold=True): + def __init__(self, func, max_time, **kwargs): self.timer = Timer(max_time) - super().__init__(func, wait_time, hold) + super().__init__(func, **kwargs) def loop(self): while self.running and self.timer: diff --git a/slic/core/task/task.py b/slic/core/task/task.py index 2d10063a5..730164010 100644 --- a/slic/core/task/task.py +++ b/slic/core/task/task.py @@ -29,11 +29,9 @@ class Task(BaseTask): def status(self): if self.thread.ident is None: return "ready" - else: - if self.thread.isAlive(): - return "running" - else: - return "done" + if self.thread.isAlive(): + return "running" + return "done" def __repr__(self): name = typename(self)