Merge pull request #26 from lightwave-lab/dev-thomas

Driver improvements and behavior changes

Author: thomaslima

lightlab/equipment/lab_instruments/Anritsu_MP1763B_PPG.py

@@ -1,6 +1,7 @@
 from . import VISAInstrumentDriver
 from lightlab.equipment.abstract_drivers import Configurable
 from lightlab.laboratory.instruments import PulsePatternGenerator
+from lightlab.util.data.one_dim import prbs_pattern
 import warnings
 import numpy as np
 import matplotlib.pyplot as plt
@@ -210,7 +211,7 @@ def circ_time(T, pattern):
 
     @classmethod
     def PRBS_pattern(cls, order, mark_ratio=0.5):
-        # Documentation present in poage 5-1 of the manual.
+        # Documentation present in page 5-1 of the manual.
         if mark_ratio != 0.5:
             raise NotImplementedError("Only mark ratio of 1/2 is implemented so far.")
 
@@ -240,21 +241,4 @@ def PRBS_pattern(cls, order, mark_ratio=0.5):
         else:
             raise NotImplementedError("PRBS{} not implemented.".format(order))
 
-        def prbs_generator(characteristic, state):
-            def compute_parity(n):
-                parity = False
-                while n > 0:
-                    parity ^= (n & 1)
-                    n >>= 1
-
-                return parity  # odd means True
-
-            while True:
-                result = state & 1
-                state += (compute_parity(state & characteristic) << order)
-                state >>= 1
-                yield result
-
-        from itertools import islice
-        prbs_pattern = list(islice(iter(prbs_generator(polynomial, seed)), 2 ** order - 1))
-        return np.array(prbs_pattern, dtype=np.bool)
+        return prbs_pattern(polynomial, seed)

lightlab/equipment/lab_instruments/Apex_AP2440A_OSA.py

@@ -190,7 +190,14 @@ def transferData(self):
 
         dataLen = int(powerData[0])
         powerData = np.array(powerData[1:])
-        wavelengthData = np.linspace(self.wlRange[1], self.wlRange[0], dataLen)
+        retStr = self._query('SPDATAWL0')
+        wavelengthData = pyvisa.util.from_ascii_block(retStr,
+                                                      converter='f',
+                                                      separator=' ',
+                                                      container=list)
+        assert dataLen == wavelengthData[0]
+        wavelengthData = np.array(wavelengthData[1:])
+        # wavelengthData = np.linspace(self.wlRange[1], self.wlRange[0], dataLen)
 
         return wavelengthData[::-1], powerData[::-1]
 
@@ -205,7 +212,7 @@ def spectrum(self, average_count=1):
             self.triggerAcquire()
             nm, dbm = self.transferData()
 
-            if i is 0:
+            if i == 0:
                 dbmAvg = dbm / average_count
             else:
                 dbmAvg = dbmAvg + dbm / average_count

lightlab/equipment/lab_instruments/Keithley_2606B_SMU.py

@@ -222,9 +222,10 @@ def tsp_startup(self, restart=False):
 
     def smu_defaults(self):
         self.write("{smuX}.source.offfunc = 0".format(smuX=self.smu_full_string))  # 0 or smuX.OUTPUT_DCAMPS: Source 0 A
-        self.write("{smuX}.source.offmode = 2".format(smuX=self.smu_full_string))  # 2 or smuX.OUTPUT_HIGH_Z: Opens the output relay when the output is turned of
-        self.write("{smuX}.sense = 0".format(smuX=self.smu_full_string))  # 0 or smuX.SENSE_LOCAL: Selects local sense (2-wire)
+        self.write("{smuX}.source.offmode = 0".format(smuX=self.smu_full_string))  # 0 or smuX.OUTPUT_NORMAL: Configures the source function according to smuX.source.offfunc attribute
         self.write("{smuX}.source.highc = 1".format(smuX=self.smu_full_string))  # 1 or smuX.ENABLE: Enables high-capacitance mode
+        # self.write("{smuX}.sense = 0".format(smuX=self.smu_full_string))  # 0 or smuX.SENSE_LOCAL: Selects local sense (2-wire)
+        self.set_sense_mode(sense_mode="local")
 
     def startup(self):
         self.tsp_startup()
@@ -234,6 +235,17 @@ def startup(self):
         time.sleep(0.01)
         self.query_print('"startup complete."', expected_talker="startup complete.")
 
+    def set_sense_mode(self, sense_mode="local"):
+        ''' Set sense mode. Defaults to local sensing. '''
+        if sense_mode == "remote":
+            sense_mode = 1  # 1 or smuX.SENSE_REMOTE: Selects remote sense (4-wire)
+        elif sense_mode == "local":
+            sense_mode = 0  # 0 or smuX.SENSE_LOCAL: Selects local sense (2-wire)
+        else:
+            sense_mode = 0  # 0 or smuX.SENSE_LOCAL: Selects local sense (2-wire)
+
+        self.write("{smuX}.sense = {sense_mode}".format(smuX=self.smu_full_string, sense_mode=sense_mode))
+
     # SourceMeter Essential methods
 
     def _configCurrent(self, currAmps):

lightlab/equipment/lab_instruments/Manuals/Apex_AP2440A_OSA.pdf

@@ -676,7 +676,7 @@ class MockInstrument(Instrument):
 
     def __getattr__(self, attrName):
         def noop(*args, **kwargs):
-            raise RuntimeError("Attempted to call a method of a mock Instrument.")
+            raise AttributeError("Attempted to call method ('{}') of a mock Instrument.".format(attrName))
         return noop