Merge remote-tracking branch 'refs/remotes/Labber-software/master'

Author: Staacks

Cryomagnetics LM510/Cryomagnetics LM510.ini

@@ -0,0 +1,106 @@
+# Instrument driver configuration file.
+
+[General settings]
+
+# The name is shown in all the configuration windows
+name: Cryomagnetics LM510
+
+# The version string should be updated whenever changes are made to this config file
+version: 1.0
+
+# Name of folder containing the code defining a custom driver. Do not define this item
+# or leave it blank for any standard driver based on the built-in VISA interface.
+driver_path: Cryomagnetics LM510
+
+
+
+[Model and options]
+# The option section allow instruments with different options to use the same driver
+
+# Check instrument model id at startup (True or False). Default is False
+check_model: False
+
+
+model_id_1: LM-510
+
+model_str_1: Cryomagnetics LM510
+
+
+
+# General VISA settings for the instrument.
+[VISA settings]
+
+# Enable or disable communication over the VISA protocol (True or False)
+# If False, the driver will not perform any operations (unless there is a custom driver).
+use_visa = True
+
+# Reset the interface (not the instrument) at startup (True or False).  Default is False
+reset: False
+
+# Time (in seconds) before the timing out while waiting for an instrument response. Default is 5
+timeout: 2
+
+# Query instrument errors (True or False).  If True, every command sent to the device will
+# be followed by an error query.  This is useful when testing new setups, but may degrade
+# performance by slowing down the instrument communication. 
+query_instr_errors: False
+
+# Bit mask for checking status byte errors (default is 255, include all errors)
+# The bits signal the following errors:
+# 0: Operation
+# 1: Request control
+# 2: Query error
+# 3: Device error
+# 4: Execution error
+# 5: Command error
+# 6: User request
+# 7: Power on
+error_bit_mask: 255
+
+# SCPI string to be used when querying for instrument error messages
+error_cmd: 
+
+# Initialization commands are sent to the instrument when starting the driver
+# *RST will reset the device, *CLS clears the interface
+init: 
+
+# Final commands sent to the instrument when closing the driver
+final: 
+
+
+# Define quantities in sections. The section name should be the same as the "name" value
+# The following keywords are allowed:
+#   name:          Quantity name
+#   unit:          Quantity unit
+#   enabled:	   Determines wether the control is enabled from start.  Default is True	
+#   datatype:      The data type should be one of DOUBLE, BOOLEAN, COMBO or STRING
+#   def_value:     Default value
+#   low_lim:       Lowest allowable value.  Defaults to -INF
+#   high_lim:      Highest allowable values.  Defaults to +INF
+#   combo_def_1:   First option in a pull-down combo box. Only used when datatype=COMBO
+#   combo_def_2:   Second option in a pull-down combo box. Only used when datatype=COMBO
+#   ...
+#   combo_def_n:   nth option in a pull-down combo box. Only used when datatype=COMBO
+#   group:         Name of the group where the control belongs.
+#   state_quant:   Quantity that determines this control's visibility
+#   state_value_1: Value of "state_quant" for which the control is visible
+#   state_value_2: Value of "state_quant" for which the control is visible
+#   ...
+#   state_value_n: Value of "state_quant" for which the control is visible
+#   permission:    Sets read/writability, options are BOTH, READ, WRITE or NONE. Default is BOTH 
+#   set_cmd:       Command used to send data to the instrument. Put <*> where the value should appear.
+#   sweep_cmd:     Command used to sweep data. Use <sr> for sweep rate, and <*> for the value.
+#   get_cmd:       Command used to get the data from the instrument. Default is set_cmd?
+
+
+[LHe Level]
+permission: READ
+datatype: DOUBLE
+unit: cm
+get_cmd: MEAS?
+
+[Interval]
+datatype: DOUBLE
+unit: s
+get_cmd: INTVL?
+set_cmd: INTVL

Cryomagnetics LM510/Cryomagnetics LM510.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+
+import InstrumentDriver
+from VISA_Driver import VISA_Driver
+import visa
+from InstrumentConfig import InstrumentQuantity
+
+__version__ = "0.0.1"
+
+class Error(Exception):
+    pass
+
+class Driver(VISA_Driver):
+    """ This class implements the Lakeshore 475 driver"""
+  
+    def performOpen(self, options={}):
+        """Perform the operation of opening the instrument connection"""
+        # calling the generic VISA open to make sure we have a connection
+        VISA_Driver.performOpen(self, options=options)
+        
+
+    def performGetValue(self, quant, options={}):
+        """Perform the Get Value instrument operation"""
+        # check type of quantity
+        self.write(quant.get_cmd, bCheckError=True)
+        self.read(None, ignore_termination=False)
+        value = self.read(None, ignore_termination=False)
+        if quant.name in ('LHe Level'):
+            value = value[:-3]
+        if quant.name in ('Interval'):
+            hms = value.split(":")
+            value = int(hms[0]) * 3600 + int(hms[1])*60 + int(hms[2])
+        return value
+        
+    def performSetValue(self, quant, value, sweepRate=0.0, options={}):
+        """Perform the set value operation"""
+        self.write("REMOTE")
+        self.read(None, ignore_termination=False)
+        if quant.name in ('Interval'):
+            m, s = divmod(value, 60)
+            h, m = divmod(m, 60)
+            cmd = quant.set_cmd + " " + ("%02d:%02d:%02d" % (h, m, s))
+            self.writeAndLog(cmd, bCheckError=True)
+            self.read(None, ignore_termination=False)
+        self.write("LOCAL")
+        self.read(None, ignore_termination=False)
+        return value
+        
+if __name__ == '__main__':
+    pass

Keysight_MXA_SA_MODE/Keysight_MXA_SA_MODE-UpgradeCfg.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+
+def upgradeDriverCfg(version, dValue={}, dOption=[]):
+    """Upgrade the config given by the dict dValue and dict dOption to the
+    latest version."""
+    # the dQuantUpdate dict contains rules for replacing missing quantities
+    dQuantReplace = {}
+    # update quantities depending on version
+    if version == '1.0':
+        # convert version 1.0 -> 1.1
+        # changes:
+        # zero-span mode moved from bool to combo box with start-stop, center-span
+        version = '1.1'
+        # assume old value quantity was referring to a voltage
+        if 'Zero-span mode' in dValue:
+            bZeroSpan = dValue.pop('Zero-span mode')
+            if bZeroSpan:
+                dValue['Range type'] = 'Zero-span mode'
+            else:
+                dValue['Range type'] = 'Center - Span'
+    # return new version and data
+    return (version, dValue, dOption, dQuantReplace)