adjusted Acquisition imports

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
 

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

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

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
 
 

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

slic/runners/__init__.py

@@ -1,4 +1,5 @@
 
+from .acquisition import Acquisition
 from .changer import Changer