From e9ef150ffa8463dc36fd18cc8298fdca08002772 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Fri, 17 Apr 2020 13:28:54 +0000 Subject: [PATCH] more consistent use of the words: path, dir, folder --- slic/daq/counter.py | 14 +++++++------- slic/daq/diacounter.py | 14 +++++++------- slic/daq/pedestals.py | 7 +++---- slic/scans/runname.py | 10 +++++----- slic/scans/scanbackend.py | 14 +++++++------- 5 files changed, 29 insertions(+), 30 deletions(-) diff --git a/slic/daq/counter.py b/slic/daq/counter.py index 66a1cfc06..e616bfe90 100644 --- a/slic/daq/counter.py +++ b/slic/daq/counter.py @@ -10,23 +10,23 @@ from .utils import can_create_file, fix_hdf5_filename, SwissFELPaths class Counter(BaseCounter): - def __init__(self, instrument, pgroup, default_channels=None, default_path=None): + def __init__(self, instrument, pgroup, default_channels=None, default_dir=None): paths = SwissFELPaths(instrument, pgroup) if not default_channels: default_channel_list = paths.default_channel_list default_channels = Channels(default_channel_list) - if not default_path: - default_path = paths.raw + if not default_dir: + default_dir = paths.raw self.default_channels = default_channels - self.default_path = default_path + self.default_dir = default_dir - def acquire(self, filename=None, channels=None, use_default_path=True, **kwargs): - if filename and use_default_path: - filename = os.path.join(self.default_path, filename) + def acquire(self, filename=None, channels=None, use_default_dir=True, **kwargs): + if filename and use_default_dir: + filename = os.path.join(self.default_dir, filename) filename = fix_hdf5_filename(filename) diff --git a/slic/daq/diacounter.py b/slic/daq/diacounter.py index 393999d29..d30d4a529 100644 --- a/slic/daq/diacounter.py +++ b/slic/daq/diacounter.py @@ -21,7 +21,7 @@ EXPTIME = { class DIACounter(BaseCounter): - def __init__(self, instrument, pgroup, default_channels=None, default_path=None, api_address=None): + def __init__(self, instrument, pgroup, default_channels=None, default_dir=None, api_address=None): self.instrument = instrument self.pgroup = pgroup @@ -32,11 +32,11 @@ class DIACounter(BaseCounter): default_channel_list = self.paths.default_channel_list default_channels = Channels(default_channel_list) - if not default_path: - default_path = self.paths.raw + if not default_dir: + default_dir = self.paths.raw self.default_channels = default_channels - self.default_path = default_path + self.default_dir = default_dir if not api_address: api_address = "http://sf-daq-{}:10000".format(instrument) @@ -45,10 +45,10 @@ class DIACounter(BaseCounter): self.client = DetectorIntegrationClient(api_address) - def acquire(self, filename=None, channels=None, n_pulses=100, use_default_path=True, is_HG0=False, **kwargs): + def acquire(self, filename=None, channels=None, n_pulses=100, use_default_dir=True, is_HG0=False, **kwargs): if filename: - if use_default_path: - filename = os.path.join(self.default_path, filename) + if use_default_dir: + filename = os.path.join(self.default_dir, filename) if not self.can_create_all_files(filename): return else: diff --git a/slic/daq/pedestals.py b/slic/daq/pedestals.py index 59cf7004b..6c15083e2 100644 --- a/slic/daq/pedestals.py +++ b/slic/daq/pedestals.py @@ -40,7 +40,7 @@ def find_last_pedestal(clients, directory="."): def extract_timestamp(fn): - fn = strip_folder(fn) + fn = strip_dir(fn) base = fn.split(".")[0] prefix = "pedestal_" assert base.startswith(prefix), "\"{}\" does not start with \"{}\"".format(base, prefix) @@ -49,12 +49,11 @@ def extract_timestamp(fn): return timestamp def extract_detector(fn): - fn = strip_folder(fn) + fn = strip_dir(fn) detector = fn.split(".")[1] return detector -def strip_folder(fn): - return os.path.split(fn)[-1] +strip_dir = os.path.basename diff --git a/slic/scans/runname.py b/slic/scans/runname.py index cf0b9ae3f..d6b859551 100644 --- a/slic/scans/runname.py +++ b/slic/scans/runname.py @@ -8,8 +8,8 @@ DIGITS = "[0-9]" class RunFilenameGenerator: - def __init__(self, path, prefix="run", n_digits=4, separator="_", extension="json"): - self.path = path + def __init__(self, base_dir, prefix="run", n_digits=4, separator="_", extension="json"): + self.base_dir = base_dir self.prefix = prefix self.n_digits = n_digits self.separator = separator @@ -22,7 +22,7 @@ class RunFilenameGenerator: return _fill_filename_pattern(name, formatted_irun) def get_existing_runnumbers(self): - fnames = glob_files(self.path, self.pattern) + fnames = glob_files(self.base_dir, self.pattern) runnums = extract_runnumbers(fnames, self.prefix, self.separator) return runnums @@ -45,8 +45,8 @@ def next_int(nums): def zero_pad(i, n): return str(i).zfill(n) -def glob_files(path, pattern): - path = Path(path) +def glob_files(folder, pattern): + path = Path(folder) fnames = path.glob(pattern) fnames = filter_files(fnames) return fnames diff --git a/slic/scans/scanbackend.py b/slic/scans/scanbackend.py index 3cff7819b..6389822c6 100644 --- a/slic/scans/scanbackend.py +++ b/slic/scans/scanbackend.py @@ -66,13 +66,13 @@ class ScanBackend: def create_output_dirs(self): - make_dir(self.scan_info.path) + make_dir(self.scan_info.base_dir) for counter in self.counters: - default_path = counter.default_path - if default_path is None: + default_dir = counter.default_dir + if default_dir is None: continue - data_dir = default_path + self.data_base_dir + data_dir = default_dir + self.data_base_dir make_dir(data_dir) @@ -137,9 +137,9 @@ def wait_for_all(runners): class ScanInfo: - def __init__(self, filename_base, path, adjustables, values): - self.path = path - self.filename = os.path.join(path, filename_base) + def __init__(self, filename_base, base_dir, adjustables, values): + self.base_dir = base_dir + self.filename = os.path.join(base_dir, filename_base) self.filename += "_scan_info.json" names = [ta.name if hasattr(ta, "name") else "noName" for ta in adjustables] #TODO else None?