Remove unecessary code duplication with hqc_legacy

exopy_qcircuits/instruments/drivers/ZI/UHFLI.py

@@ -10,7 +10,7 @@
 
 from __future__ import (division, unicode_literals, print_function,
                         absolute_import)
-from ..driver_tools import (InstrIOError, instrument_property,
+from exopy_hqc_legacy.instruments.drivers.driver_tools import (InstrIOError, instrument_property,
                             secure_communication)
 import sys
 from subprocess import call
@@ -483,4 +483,4 @@ def get_DAQmodule(self, DAM, dimensions, signalID,signal_paths):
 
     # Stub class to remove make exopy happy
     class UHFLI:
-        pass
+        pass

exopy_qcircuits/instruments/drivers/ZI_tools.py

@@ -17,7 +17,7 @@
 import sys, os
 
 
-from .driver_tools import BaseInstrument, InstrIOError
+from exopy_hqc_legacy.instruments.drivers.driver_tools import BaseInstrument, InstrIOError
 
 
 class ZIInstrument(BaseInstrument):

exopy_qcircuits/instruments/drivers/dll/alazar935x.py

@@ -30,7 +30,7 @@
 
 logger = logging.getLogger(__name__)
 
-from ..dll_tools import DllInstrument
+from exopy_hqc_legacy.instruments.drivers.dll_tools import DllInstrument
 
 try:
     from . import atsapi as ats

exopy_qcircuits/instruments/drivers/dll/alazar935xMODIFSMARCOSAVE.py

@@ -30,7 +30,7 @@
 import glob
 import re
 
-from ..dll_tools import DllInstrument
+from exopy_hqc_legacy.instruments.drivers.dll_tools import DllInstrument
 from . import atsapi as ats
 
 
@@ -417,4 +417,4 @@ def get_demod(self, startaftertrig, duration, recordsPerCapture,
 
         mon_fichier.close()
 
-        return answerDemod, answerTrace
+        return answerDemod, answerTrace

exopy_qcircuits/instruments/drivers/dll/alazar935xTEMPSBUFFERTEMPSMISEENFORME.py

@@ -27,7 +27,7 @@
 import math
 import time
 
-from ..dll_tools import DllInstrument
+from exopy_hqc_legacy.instruments.drivers.dll_tools import DllInstrument
 from . import atsapi as ats
 
 
@@ -467,4 +467,4 @@ def get_demod(self, startaftertrig, duration, recordsPerCapture,
             else:
                 answerTrace[Tracestring][:,:samplesPerDemod[i]] = data[i]
 
-        return answerDemod, answerTrace
+        return answerDemod, answerTrace

exopy_qcircuits/instruments/drivers/dll/labbrick.py

@@ -16,9 +16,10 @@
 To read the Dll of the LabBrick correctly, Visual C++ Studio 2013 is needed.
 
 """
-from ..driver_tools import (InstrIOError, secure_communication,
-                            instrument_property)
-from ..dll_tools import DllLibrary, DllInstrument
+from exopy_hqc_legacy.instruments.drivers.driver_tools import (InstrIOError,
+                                                               secure_communication,
+                                                               instrument_property)
+from exopy_hqc_legacy.instruments.drivers.dll_tools import DllLibrary, DllInstrument
 from inspect import cleandoc
 import ctypes