From c252df1f77e2712f609d77ccad122634ccc2104f Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Sun, 3 May 2020 18:03:29 +0000 Subject: [PATCH] counter -> acquisition --- slic/acquisition/__init__.py | 7 +++++++ .../{daq/counter.py => acquisition/acquisition.py} | 4 ++-- .../baseacquisition.py} | 2 +- .../bscounter.py => acquisition/bsacquisition.py} | 4 ++-- slic/{daq => acquisition}/bschannels.py | 0 .../dbcounter.py => acquisition/dbacquisition.py} | 4 ++-- .../diaacquisition.py} | 4 ++-- slic/{daq => acquisition}/pedestals.py | 0 .../pvcounter.py => acquisition/pvacquisition.py} | 4 ++-- slic/{daq => acquisition}/utils.py | 0 slic/daq/__init__.py | 7 ------- slic/scans/scanbackend.py | 14 +++++++------- slic/scans/scanner.py | 12 ++++++------ 13 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 slic/acquisition/__init__.py rename slic/{daq/counter.py => acquisition/acquisition.py} (94%) rename slic/{daq/basecounter.py => acquisition/baseacquisition.py} (80%) rename slic/{daq/bscounter.py => acquisition/bsacquisition.py} (84%) rename slic/{daq => acquisition}/bschannels.py (100%) rename slic/{daq/dbcounter.py => acquisition/dbacquisition.py} (91%) rename slic/{daq/diacounter.py => acquisition/diaacquisition.py} (98%) rename slic/{daq => acquisition}/pedestals.py (100%) rename slic/{daq/pvcounter.py => acquisition/pvacquisition.py} (96%) rename slic/{daq => acquisition}/utils.py (100%) delete mode 100644 slic/daq/__init__.py diff --git a/slic/acquisition/__init__.py b/slic/acquisition/__init__.py new file mode 100644 index 000000000..161d9bfff --- /dev/null +++ b/slic/acquisition/__init__.py @@ -0,0 +1,7 @@ + +from .bsacquisition import BSAcquisition +from .dbacquisition import DBAcquisition +from .diaacquisition import DIAAcquisition +from .pvacquisition import PVAcquisition + + diff --git a/slic/daq/counter.py b/slic/acquisition/acquisition.py similarity index 94% rename from slic/daq/counter.py rename to slic/acquisition/acquisition.py index 1d8ad5214..91748cadc 100644 --- a/slic/daq/counter.py +++ b/slic/acquisition/acquisition.py @@ -3,12 +3,12 @@ from abc import abstractmethod from ..utils.channels import Channels from slic.task import Task -from .basecounter import BaseCounter +from .baseacquisition import BaseAcquisition from .utils import can_create_file, fix_hdf5_filename, SwissFELPaths from slic.utils import typename -class Counter(BaseCounter): +class Acquisition(BaseAcquisition): def __init__(self, instrument, pgroup, default_channels=None, default_dir=None): self.instrument = instrument diff --git a/slic/daq/basecounter.py b/slic/acquisition/baseacquisition.py similarity index 80% rename from slic/daq/basecounter.py rename to slic/acquisition/baseacquisition.py index d8b7fbc9f..d13e56391 100644 --- a/slic/daq/basecounter.py +++ b/slic/acquisition/baseacquisition.py @@ -1,7 +1,7 @@ from abc import ABC, abstractmethod -class BaseCounter(ABC): +class BaseAcquisition(ABC): @abstractmethod def acquire(self): diff --git a/slic/daq/bscounter.py b/slic/acquisition/bsacquisition.py similarity index 84% rename from slic/daq/bscounter.py rename to slic/acquisition/bsacquisition.py index ee12c9d5b..16718a0a5 100644 --- a/slic/daq/bscounter.py +++ b/slic/acquisition/bsacquisition.py @@ -3,11 +3,11 @@ import zmq from bsread.h5 import receive from bsread.avail import dispatcher -from .counter import Counter +from .acquisition import Acquisition -class BSCounter(Counter): +class BSAcquisition(Acquisition): def _acquire(self, *args, **kwargs): bsread_to_h5(*args, **kwargs) diff --git a/slic/daq/bschannels.py b/slic/acquisition/bschannels.py similarity index 100% rename from slic/daq/bschannels.py rename to slic/acquisition/bschannels.py diff --git a/slic/daq/dbcounter.py b/slic/acquisition/dbacquisition.py similarity index 91% rename from slic/daq/dbcounter.py rename to slic/acquisition/dbacquisition.py index 90e62ca0e..25cf812f8 100644 --- a/slic/daq/dbcounter.py +++ b/slic/acquisition/dbacquisition.py @@ -2,11 +2,11 @@ from datetime import datetime, timedelta import data_api as dapi -from .counter import Counter +from .acquisition import Acquisition -class DBCounter(Counter): +class DBAcquisition(Acquisition): def _acquire(self, *args, **kwargs): dapi_to_h5(*args, **kwargs) diff --git a/slic/daq/diacounter.py b/slic/acquisition/diaacquisition.py similarity index 98% rename from slic/daq/diacounter.py rename to slic/acquisition/diaacquisition.py index 3ac10f55e..52689155c 100644 --- a/slic/daq/diacounter.py +++ b/slic/acquisition/diaacquisition.py @@ -6,7 +6,7 @@ from detector_integration_api import DetectorIntegrationClient from ..utils.channels import Channels from ..utils.printing import printable_dict_of_dicts from slic.task import Task -from .basecounter import BaseCounter +from .baseacquisition import BaseAcquisition from .utils import can_create_file, SwissFELPaths from .pedestals import find_last_pedestal, take_pedestal @@ -19,7 +19,7 @@ EXPTIME = { -class DIACounter(BaseCounter): +class DIAAcquisition(BaseAcquisition): def __init__(self, instrument, pgroup, default_channels=None, default_dir=None, api_address=None): self.instrument = instrument diff --git a/slic/daq/pedestals.py b/slic/acquisition/pedestals.py similarity index 100% rename from slic/daq/pedestals.py rename to slic/acquisition/pedestals.py diff --git a/slic/daq/pvcounter.py b/slic/acquisition/pvacquisition.py similarity index 96% rename from slic/daq/pvcounter.py rename to slic/acquisition/pvacquisition.py index e091a3c90..1419771a6 100644 --- a/slic/daq/pvcounter.py +++ b/slic/acquisition/pvacquisition.py @@ -2,11 +2,11 @@ from time import sleep import numpy as np from epics import PV -from .counter import Counter +from .acquisition import Acquisition -class PVCounter(Counter): +class PVAcquisition(Acquisition): def _acquire(self, *args, polling=False, **kwargs): if polling: diff --git a/slic/daq/utils.py b/slic/acquisition/utils.py similarity index 100% rename from slic/daq/utils.py rename to slic/acquisition/utils.py diff --git a/slic/daq/__init__.py b/slic/daq/__init__.py deleted file mode 100644 index 1565628cf..000000000 --- a/slic/daq/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ - -from .bscounter import BSCounter -from .dbcounter import DBCounter -from .diacounter import DIACounter -from .pvcounter import PVCounter - - diff --git a/slic/scans/scanbackend.py b/slic/scans/scanbackend.py index 860659974..ee247fbc8 100644 --- a/slic/scans/scanbackend.py +++ b/slic/scans/scanbackend.py @@ -9,10 +9,10 @@ from ..utils.ask_yes_no import ask_Yes_no class ScanBackend: - def __init__(self, adjustables, values, counters, filename, n_pulses, data_base_dir, scan_info_dir, make_scan_sub_dir, condition): + def __init__(self, adjustables, values, acquisitions, filename, n_pulses, data_base_dir, scan_info_dir, make_scan_sub_dir, condition): self.adjustables = adjustables self.values = values - self.counters = counters + self.acquisitions = acquisitions self.filename = filename self.n_pulses_per_step = n_pulses #TODO: to rename or not to rename? self.data_base_dir = data_base_dir @@ -58,7 +58,7 @@ class ScanBackend: print("Moved adjustables, starting acquisition") fn = self.get_filename(n_step) - step_filenames = self.acquire_all_counters(fn) + step_filenames = self.acquire_all(fn) print("Acquisition done") self.scan_info.update(step_values, step_readbacks, step_filenames, step_info) @@ -67,8 +67,8 @@ class ScanBackend: def create_output_dirs(self): make_dir(self.scan_info.base_dir) - for counter in self.counters: - default_dir = counter.default_dir + for acq in self.acquisitions: + default_dir = acq.default_dir if default_dir is None: continue data_dir = default_dir + self.data_base_dir @@ -86,10 +86,10 @@ class ScanBackend: return filename - def acquire_all_counters(self, filename): + def acquire_all(self, filename): acqs = [] filenames = [] - for ctr in self.counters: + for ctr in self.acquisitions: acq = ctr.acquire(filename=filename, n_pulses=self.n_pulses_per_step) acqs.append(acq) filenames.extend(acq.filenames) diff --git a/slic/scans/scanner.py b/slic/scans/scanner.py index 0c06496cd..1cb0e97b4 100644 --- a/slic/scans/scanner.py +++ b/slic/scans/scanner.py @@ -13,23 +13,23 @@ def make_positions(start, end, n): class Scanner: - def __init__(self, data_base_dir="", scan_info_dir="", default_counters=[], 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_counters = default_counters + self.default_acquisitions = default_acquisitions self.condition = condition self.make_scan_sub_dir = make_scan_sub_dir self.filename_generator = RunFilenameGenerator(scan_info_dir) - def make_scan(self, adjustables, positions, n_pulses, filename, counters=[], 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 counters: - counters = self.default_counters + if not acquisitions: + acquisitions = self.default_acquisitions - s = ScanBackend(adjustables, positions, counters, filename, 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) + s = ScanBackend(adjustables, positions, acquisitions, filename, 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) if start_immediately: s.scan(step_info=step_info)