Merge branch 'development' into fourier-processing

atait · atait · commit ec551a3f2f57 · 2018-09-10T20:44:30.000-06:00
diff --git a/lightlab/equipment/lab_instruments/Keithley_2400_SM.py b/lightlab/equipment/lab_instruments/Keithley_2400_SM.py
@@ -74,7 +74,10 @@ def setCurrentMode(self, protectionVoltage=1):
 
     def _configCurrent(self, currAmps):
         currAmps = float(currAmps)
-        currAmps = np.clip(currAmps, a_min=1e-6, a_max=1.)
+        if currAmps >= 0:
+            currAmps = np.clip(currAmps, a_min=1e-9, a_max=1.)
+        else:
+            currAmps = np.clip(currAmps, a_min=-1, a_max=-1e-9)
         if currAmps != 0:
             needRange = 10 ** np.ceil(np.log10(abs(currAmps)))
             self.setConfigParam('SOURCE:CURR:RANGE', needRange)
diff --git a/lightlab/util/data/two_dim.py b/lightlab/util/data/two_dim.py
@@ -11,9 +11,9 @@
 from itertools import repeat
 
 from .one_dim import MeasuredFunction, Waveform
+from lightlab.laboratory import Hashable
 
-
-class FunctionBundle(object):  # pylint: disable=eq-without-hash
+class FunctionBundle(Hashable):  # pylint: disable=eq-without-hash
     ''' A bundle of :class:`~lightlab.util.data.one_dim.MeasuredFunction`'s: "z" vs. "x", "i"
 
         The key is that they have the same abscissa base.
