Merge branch 'main' of https://github.com/sandialabs/pyscan into fix_keysight_spelling

rsbrost · rsbrost · commit a4a9480e6bca · 2024-05-28T12:56:44.000-06:00
diff --git a/pyscan/drivers/actonsp2300.py b/pyscan/drivers/actonsp2300.py
@@ -35,10 +35,13 @@ class ActonSP2300(InstrumentDriver):
     '''
 
     def __init__(self, com, baud=9600, timeout=5):
+
         self.ser = serial.Serial(com, baud, timeout=timeout)
         time.sleep(1)
 
         self.debug = False
+        self._version = "0.1.0"
+
         self.initialize_properties()
 
     def flush(self):
diff --git a/pyscan/drivers/agilent33500.py b/pyscan/drivers/agilent33500.py
@@ -64,6 +64,7 @@ def __init__(self, instrument, channel):
         self.channel = channel
 
         self.gain = 1
+        self._version = "0.1.0"
 
         self.debug = False
         self.initialize_properties()
diff --git a/pyscan/drivers/agilent34410.py b/pyscan/drivers/agilent34410.py
@@ -23,6 +23,8 @@ def __init__(self, instrument):
         super().__init__(instrument)
 
         self.debug = False
+        self._version = "0.1.0"
+
 #         self.initialize_properties()
 
     def measure_voltage_DC(self):
diff --git a/pyscan/drivers/agilent8267d.py b/pyscan/drivers/agilent8267d.py
@@ -31,6 +31,8 @@ def __init__(self, instrument):
         super().__init__(instrument)
 
         self.debug = False
+        self._version = "0.1.0"
+
         self.initialize_properties()
 
     def initialize_properties(self):
diff --git a/pyscan/drivers/agilent8275n.py b/pyscan/drivers/agilent8275n.py
@@ -30,6 +30,8 @@ def __init__(self, instrument):
         self.gain = 1
 
         self.debug = False
+        self._version = "0.1.0"
+
         self.initialize_properties()
 
     def initialize_properties(self):
diff --git a/pyscan/drivers/agilentdso900series.py b/pyscan/drivers/agilentdso900series.py
@@ -75,6 +75,7 @@ def __init__(self, instrument):
         super().__init__(instrument)
 
         self.debug = False
+        self._version = "0.1.0"
         self.initialize_properties()
 
     def initialize_properties(self):
diff --git a/pyscan/drivers/americanmagnetics430.py b/pyscan/drivers/americanmagnetics430.py
@@ -31,6 +31,8 @@ def __init__(self, instrument):
         instrument.read_termination = '\r\n'
         instrument.write_termination = '\r'
 
+        self._version = "0.1.0"
+
         # visa object
         self.instrument = instrument
 
diff --git a/pyscan/drivers/attocubeANC350.py b/pyscan/drivers/attocubeANC350.py
@@ -9,6 +9,8 @@ def __init__(self, instrument):
 
         super().__init__(instrument)
 
+        self._version = "0.1.0"
+
         self.inst = ANC350()
         # self.debug = False
         # self.initialize_properties()
diff --git a/pyscan/drivers/bkprecision9130b.py b/pyscan/drivers/bkprecision9130b.py
@@ -32,6 +32,8 @@ def __init__(self, instrument):
         super().__init__(instrument)
 
         self.debug = False
+        self._version = "0.1.0"
+
         self.initialize_properties()
 
     def initialize_properties(self):
diff --git a/pyscan/drivers/blueforslog.py b/pyscan/drivers/blueforslog.py
@@ -101,6 +101,7 @@ class BlueForsLog(object):
     def __init__(self, path, date='now'):
         self.path = Path(path)
         self.date = date
+        self._version = "0.1.0"
 
     def get_path(self, file):
 
diff --git a/pyscan/drivers/helioscamera.py b/pyscan/drivers/helioscamera.py
@@ -21,6 +21,9 @@
 class HeliosSDK(ItemAttribute):
 
     def __init__(self):
+
+        self._version = "0.1.0"
+
         pass
 
     def add_device_property(self, settings):
diff --git a/pyscan/drivers/hp34401a.py b/pyscan/drivers/hp34401a.py
@@ -25,6 +25,8 @@ def __init__(self, instrument):
         self.gain = 1
 
         self.debug = False
+        self._version = "0.1.0"
+
         self.initialize_properties()
 
     def initialize_properties(self):
diff --git a/pyscan/drivers/keithley2260b.py b/pyscan/drivers/keithley2260b.py
@@ -73,7 +73,7 @@ def __init__(self, instrument, debug=False):
 
         self.debug = False
 
-        self._version = "0.0.1"
+        self._version = "0.1.0"
 
         # Get current limits
         self.max_current = float(self.query('CURR? MAX').strip('\n'))
diff --git a/pyscan/drivers/keithley2400.py b/pyscan/drivers/keithley2400.py
@@ -35,6 +35,8 @@ class Keithley2400(InstrumentDriver):
     def __init__(self, instrument):
         self.instrument = instrument
 
+        self._version = "0.1.0"
+
         self.init_settings()
 
         self.update_properties()
diff --git a/pyscan/drivers/kepcoBOP.py b/pyscan/drivers/kepcoBOP.py
@@ -21,6 +21,7 @@ def __init__(self,
                  ):
 
         self.instrument = instrument
+        self._version = "0.1.0"
 
         # magnetic field properties
         self.tesla_per_amp = tesla_per_amp
diff --git a/pyscan/drivers/keysight53230a.py b/pyscan/drivers/keysight53230a.py
@@ -20,6 +20,7 @@ def __init__(self, instrument, channel):
         super().__init__(instrument)
 
         self.debug = False
+        self._version = "0.1.0"
 
         self.channel = channel
 
diff --git a/pyscan/drivers/keysightm3302aawg.py b/pyscan/drivers/keysightm3302aawg.py
@@ -29,6 +29,8 @@ def __init__(self, chassis, slot):
         self.chassis = chassis
         self.slot = slot
 
+        self._version = "0.1.0"
+
         self.module = keysightSD1.SD_AOU()
         self.module.openWithSlot("", self.chassis, self.slot)
 
diff --git a/pyscan/drivers/keysightm3302adaq.py b/pyscan/drivers/keysightm3302adaq.py
@@ -49,6 +49,7 @@ def __init__(self, chassis, slot, channel):
         self.chassis = chassis
         self.slot = slot
         self.channel = channel
+        self._version = "0.1.0"
 
         self.module = keysightSD1.SD_AIN()
         self.module.openWithSlot("", self.chassis, self.slot)
diff --git a/pyscan/drivers/oceanopticsqepro.py b/pyscan/drivers/oceanopticsqepro.py
@@ -31,6 +31,7 @@ def __init__(self, sn=None):
             self.spec = Spectrometer.from_serial_number(sn)
         self.sn = sn
         self.set_integration_time(.25)
+        self._version = "0.1.0"
 
     def set_integration_time(self, value):
         '''
diff --git a/pyscan/drivers/oxfordigh.py b/pyscan/drivers/oxfordigh.py
@@ -14,6 +14,8 @@ def __init__(self, instrument):
         self.set_remote_unlocked()
 
         self.debug = False
+        self._version = "0.1.0"
+
         self.initialize_properties()
 
     def initialize_properties(self):
diff --git a/pyscan/drivers/oxfordips120.py b/pyscan/drivers/oxfordips120.py
@@ -23,6 +23,7 @@ def __init__(self, instrument):
 
         self.field_limit = 8
         self.field_rate_limit = 0.1
+        self._version = "0.1.0"
 
         self.debug = False
         self.initialize_properties()
diff --git a/pyscan/drivers/picoharp300.py b/pyscan/drivers/picoharp300.py
@@ -97,6 +97,8 @@ class PicoHarp300(ItemAttribute):
 
     def __init__(self, dev=0):
 
+        self._version = "0.1.0"
+
         retcode = phlib.PH_OpenDevice(ctypes.c_int(dev), hwSerial)
         if retcode == 0:
             print("{}S/N {}".format(dev, hwSerial.value.decode("utf-8")))
diff --git a/pyscan/drivers/princetonpimax4.py b/pyscan/drivers/princetonpimax4.py
@@ -42,6 +42,7 @@ def __init__(self, verbose=False):
         self.file_manager = self.application.FileManager
 
         self.verbose = False
+        self._version = "0.1.0"
 
     def print_device_information(self):
         print("Experiment Device Information:")
diff --git a/pyscan/drivers/pulseblaster.py b/pyscan/drivers/pulseblaster.py
@@ -139,6 +139,8 @@ def __init__(self, clock=500, board=0, **kwarg):
         for key, value in kwarg.items():
             self[key] = value
 
+        self._version = "0.1.0"
+
         self.clock = clock
         self.board = board
 
diff --git a/pyscan/drivers/pulselaser.py b/pyscan/drivers/pulselaser.py
@@ -8,6 +8,8 @@ class PulseLaser(InstrumentDriver):
 
     def __init__(self, com):
         print(com)
+        self._version = "0.1.0"
+
         self.instrument = serial.Serial(port=com,
                                         baudrate=9600,
                                         parity=serial.PARITY_NONE,
diff --git a/pyscan/drivers/pylonsdk.py b/pyscan/drivers/pylonsdk.py
@@ -5,7 +5,7 @@
 class PylonSDK(ItemAttribute):
 
     def __init__(self):
-        pass
+        self._version = "0.1.0"
 
     def add_device_property(self, settings):
         '''
diff --git a/pyscan/drivers/stanford396.py b/pyscan/drivers/stanford396.py
@@ -50,6 +50,8 @@ def __init__(self, instrument):
         super().__init__(instrument)
 
         self.debug = False
+        self._version = "0.1.0"
+
         self.initialize_properties()
 
     def initialize_properties(self):
diff --git a/pyscan/drivers/stanford400.py b/pyscan/drivers/stanford400.py
@@ -79,6 +79,8 @@ def __init__(self, instrument):
         super().__init__(instrument)
 
         self.debug = False
+        self._version = "0.1.0"
+
         self.initialize_properties()
 
     @property
diff --git a/pyscan/drivers/stanford470.py b/pyscan/drivers/stanford470.py
@@ -22,6 +22,7 @@ def __init__(self, instrument):
         super().__init__(instrument)
 
         self.debug = False
+        self._version = "0.1.0"
         self.initialize_properties()
 
     def initialize_properties(self):
diff --git a/pyscan/drivers/stanford620.py b/pyscan/drivers/stanford620.py
@@ -28,6 +28,7 @@ def __init__(self, instrument):
         super().__init__(instrument)
 
         self.debug = False
+        self._version = "0.1.0"
         self.initialize_properties()
 
     def initialize_properties(self):
diff --git a/pyscan/drivers/stanford830.py b/pyscan/drivers/stanford830.py
@@ -73,6 +73,7 @@ def __init__(self, instrument):
         super().__init__(instrument)
 
         self.debug = False
+        self._version = "0.1.0"
         self.initialize_properties()
         self.black_list_for_testing = ['_input_configuration', "_time_constant", '_sample_rate']
 
diff --git a/pyscan/drivers/stanford860.py b/pyscan/drivers/stanford860.py
@@ -18,7 +18,7 @@ def __init__(self, instrument):
         super().__init__(instrument)
 
         self.gain = 1
-
+        self._version = "0.1.0"
         self.debug = False
 
     def read_output(self, source):
diff --git a/pyscan/drivers/stanford900.py b/pyscan/drivers/stanford900.py
@@ -47,6 +47,7 @@ def __init__(self, instrument, port=None):
         self.instrument = instrument
         self.port = port
         self.module_id_string = None
+        self._version = "0.1.0"
 
         # reset mainframe to default configuration (prevents conflicts between Matlab and Python)
         self.write('*RST')
diff --git a/pyscan/drivers/stanford928.py b/pyscan/drivers/stanford928.py
@@ -17,8 +17,8 @@ def __init__(self, instrument, port, debug=False):
         super().__init__(instrument, port, debug=debug)
         # Stanford900.__init__(self, instrument, port)
 
+        self._version = "0.1.0"
         self.init_settings()
-
         self.update_properties()
 
         if self._service_indicator == 1:
diff --git a/pyscan/drivers/thorlabsbpc303.py b/pyscan/drivers/thorlabsbpc303.py
@@ -20,6 +20,7 @@ class ThorlabsBPC303(ItemAttribute):
     '''
 
     def __init__(self, serial="71872242"):
+        self._version = "0.1.0"
         self.serial = c_char_p(bytes(serial, "utf-8"))
         if self.build_device_list() != 0:
             assert 0, 'Could not build device list'
diff --git a/pyscan/drivers/thorlabsbsc203.py b/pyscan/drivers/thorlabsbsc203.py
@@ -21,6 +21,7 @@ class ThorlabsBSC203(ItemAttribute):
     '''
 
     def __init__(self, serial="70878515"):
+        self._version = "0.1.0"
         self.serial = c_char_p(bytes(serial, "utf-8"))
         if self.build_device_list() != 0:
             assert 0, 'Could not build device list'
diff --git a/pyscan/drivers/thorlabsitc4001.py b/pyscan/drivers/thorlabsitc4001.py
@@ -20,7 +20,7 @@ class ThorLabsITC4001(InstrumentDriver):
     def __init__(self, instrument):
 
         super().__init__(instrument)
-
+        self._version = "0.1.0"
         self.debug = False
         self.initialize_properties()
 
diff --git a/pyscan/drivers/thorlabsmff101.py b/pyscan/drivers/thorlabsmff101.py
@@ -20,6 +20,7 @@ class ThorlabsMFF101(ItemAttribute):
     '''
 
     def __init__(self, serial):
+        self._version = "0.1.0"
         self.serial = c_char_p(bytes(serial, "utf-8"))
         self.build_device_list()
         self.open()
diff --git a/pyscan/drivers/tpi1002a.py b/pyscan/drivers/tpi1002a.py
@@ -69,6 +69,7 @@ def __init__(self, instrument):
         super().__init__(instrument)
 
         self.debug = False
+        self._version = "0.1.0"
         self.instrument.baud_rate = 3000000
         self.initialize_properties()
         self.user_control = 1
diff --git a/pyscan/drivers/yokogawags200.py b/pyscan/drivers/yokogawags200.py
@@ -36,6 +36,7 @@ def __init__(self, instrument, dt=0.1, step_size=0.03):
 
         self.dt = dt
         self.step_size = step_size
+        self._version = "0.1.0"
 
         self.debug = False
         self.initialize_properties()
diff --git a/pyscan/drivers/zurichhf2.py b/pyscan/drivers/zurichhf2.py
@@ -154,6 +154,7 @@ def __init__(self, dev, channel):
         self.channel = channel
         self.wf = channel + 6
         self.daq = ziPython.ziDAQServer('localhost', 8005)
+        self._version = "0.1.0"
 
         self.debug = False
 
