From d8176100cbbb68467e009c7f7b5668cd0e883bbb Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Tue, 21 Apr 2020 19:35:30 +0000 Subject: [PATCH] adjusted Acquisition imports --- slic/daq/counter.py | 2 +- slic/daq/diacounter.py | 2 +- slic/devices/general/detectors.py | 2 +- slic/devices/general/detectors_new.py | 2 +- slic/devices/general/unused/alvra_detectors.py | 2 +- slic/runners/__init__.py | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/slic/daq/counter.py b/slic/daq/counter.py index f57acd579..84fc642a0 100644 --- a/slic/daq/counter.py +++ b/slic/daq/counter.py @@ -2,7 +2,7 @@ import os from abc import abstractmethod from ..utils.channels import Channels -from ..runners.acquisition import Acquisition +from slic.runners import Acquisition from .basecounter import BaseCounter from .utils import can_create_file, fix_hdf5_filename, SwissFELPaths diff --git a/slic/daq/diacounter.py b/slic/daq/diacounter.py index 6b2d0bc21..0753f6762 100644 --- a/slic/daq/diacounter.py +++ b/slic/daq/diacounter.py @@ -5,7 +5,7 @@ from detector_integration_api import DetectorIntegrationClient from ..utils.channels import Channels from ..utils.printing import printable_dict_of_dicts -from ..runners.acquisition import Acquisition +from slic.runners import Acquisition from .basecounter import BaseCounter from .utils import can_create_file, SwissFELPaths from .pedestals import find_last_pedestal, take_pedestal diff --git a/slic/devices/general/detectors.py b/slic/devices/general/detectors.py index c18648ab9..d1ba9a5cf 100755 --- a/slic/devices/general/detectors.py +++ b/slic/devices/general/detectors.py @@ -11,7 +11,7 @@ import h5py from time import sleep from datetime import datetime -from slic.runners.acquisition import Acquisition +from slic.runners import Acquisition try: import sys, os diff --git a/slic/devices/general/detectors_new.py b/slic/devices/general/detectors_new.py index 8f997e176..4f073b72d 100755 --- a/slic/devices/general/detectors_new.py +++ b/slic/devices/general/detectors_new.py @@ -11,7 +11,7 @@ import h5py from time import sleep,time from datetime import datetime -from slic.daq.utilities import Acquisition +from slic.runners import Acquisition from slic.utils.eco_components.aliases import Alias diff --git a/slic/devices/general/unused/alvra_detectors.py b/slic/devices/general/unused/alvra_detectors.py index b1562c6c9..51bbda7fb 100755 --- a/slic/devices/general/unused/alvra_detectors.py +++ b/slic/devices/general/unused/alvra_detectors.py @@ -11,7 +11,7 @@ import h5py from time import sleep from datetime import datetime -from ..acquisition.utilities import Acquisition +from slic.runners import Acquisition from bsread import Source from bsread.h5 import receive diff --git a/slic/runners/__init__.py b/slic/runners/__init__.py index 6a6df6d36..2aa6d7ed0 100644 --- a/slic/runners/__init__.py +++ b/slic/runners/__init__.py @@ -1,4 +1,5 @@ +from .acquisition import Acquisition from .changer import Changer