spirack 0.2.19__tar.gz → 0.2.20__tar.gz

{spirack-0.2.19 → spirack-0.2.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spirack
-Version: 0.2.19
+Version: 0.2.20
 Summary: Drivers for the QuTech SPI-rack
 Home-page: https://github.com/qutechdev/SPI-rack
 Author: QuTech Electronics Team

{spirack-0.2.19 → spirack-0.2.20}/spirack/D5a_module.py

@@ -44,8 +44,8 @@ class D5a_module(object):
 
     # DAC software span constants
     range_4V_uni = 0
-    range_4V_bi = 2
     range_8V_uni = 1
+    range_4V_bi = 2
     range_8V_bi = 3
     range_2V_bi = 4
 
@@ -67,7 +67,7 @@ class D5a_module(object):
         self.spi_rack = spi_rack
         self.module = module
         self._num_dacs = num_dacs
-        self.span = [np.nan]*self._num_dacs
+        self.spans = [np.nan]*self._num_dacs
         self.voltages = [np.nan]*self._num_dacs
 
         for i in range(self._num_dacs):
@@ -108,7 +108,7 @@ class D5a_module(object):
         if DAC not in range(self._num_dacs):
             raise ValueError('D5a module {} [change_span_update]: DAC {} does not exist.'.format(self.module, DAC))
 
-        self.span[DAC] = span
+        self.spans[DAC] = span
 
         # Determine which DAC in IC by checking even/uneven
         address = (DAC%2)<<1
@@ -130,7 +130,7 @@ class D5a_module(object):
         # The change of span will also cause a change in the actual output voltage
         # Make update to the voltages array to reflect that change
         new_settings = self.get_settings(DAC)       # read from actual hardware
-        self.span[DAC] = new_settings[0]            # update to the cached variables
+        self.voltages[DAC] = new_settings[0]        # update to the cached variables
 
     def change_span(self, DAC, span):
         """Changes the software span of selected DAC without update
@@ -148,7 +148,7 @@ class D5a_module(object):
         if DAC not in range(self._num_dacs):
             raise ValueError('D5a module {} [change_span]: DAC {} does not exist.'.format(self.module, DAC))
 
-        self.span[DAC] = span
+        self.spans[DAC] = span
 
         # Determine which DAC in IC by checking even/uneven
         address = (DAC%2)<<1
@@ -272,27 +272,27 @@ class D5a_module(object):
 
         step = self.get_stepsize(DAC)
 
-        if self.span[DAC] == D5a_module.range_4V_uni:
+        if self.spans[DAC] == D5a_module.range_4V_uni:
             bit_value = int(round(voltage / step))
             self.voltages[DAC] = bit_value * step
             maxV = 4.0
             minV = 0.0
-        elif self.span[DAC] == D5a_module.range_4V_bi:
+        elif self.spans[DAC] == D5a_module.range_4V_bi:
             bit_value = int(round((voltage + 4.0) / step))
             self.voltages[DAC] = (bit_value * step) - 4.0
             maxV = 4.0
             minV = -4.0
-        if self.span[DAC] == D5a_module.range_8V_uni:
+        if self.spans[DAC] == D5a_module.range_8V_uni:
             bit_value = int(round(voltage / step))
             self.voltages[DAC] = bit_value * step
             maxV = 8.0
             minV = 0.0
-        elif self.span[DAC] == D5a_module.range_8V_bi:
+        elif self.spans[DAC] == D5a_module.range_8V_bi:
             bit_value = int(round((voltage + 8.0) / step))
             self.voltages[DAC] = (bit_value * step) - 8.0
             maxV = 8.0
             minV = -8.0
-        elif self.span[DAC] == D5a_module.range_2V_bi:
+        elif self.spans[DAC] == D5a_module.range_2V_bi:
             bit_value = int(round((voltage + 2.0) / step))
             self.voltages[DAC] = (bit_value * step) - 2.0
             maxV = 2.0
@@ -331,16 +331,16 @@ class D5a_module(object):
         if DAC not in range(self._num_dacs):
             raise ValueError('D5a module {} [get_stepsize]: DAC {} does not exist.'.format(self.module, DAC))
 
-        if self.span[DAC] == D5a_module.range_4V_uni:
-            return 4.0 / (2 ** 18)
-        elif self.span[DAC] == D5a_module.range_4V_bi or self.span[DAC] == D5a_module.range_8V_uni:
-            return 8.0 / (2 ** 18)
-        elif self.span[DAC] == D5a_module.range_8V_bi:
-            return 16.0 / (2 ** 18)
-        elif self.span[DAC] == D5a_module.range_2V_bi:
-            return 4.0 / (2 ** 18)
+        if self.spans[DAC] == D5a_module.range_4V_uni:
+            return 4.0/(2**18)
+        elif (self.spans[DAC] == D5a_module.range_4V_bi or self.spans[DAC] == D5a_module.range_8V_uni):
+            return 8.0/(2**18)
+        elif self.spans[DAC] == D5a_module.range_8V_bi:
+            return 16.0/(2**18)
+        elif self.spans[DAC] == D5a_module.range_2V_bi:
+            return 4.0/(2**18)
         else:
-            raise ValueError(f"Span for DAC {DAC} not set to valid value. Span currently set to {self.span[DAC]}.")
+            raise ValueError("Span for DAC ",DAC," is not a valid value. The span is currently set to ".self.span[DAC],".")
 
     def get_settings(self, DAC):
         """Reads current DAC settings
@@ -362,14 +362,14 @@ class D5a_module(object):
         DAC_ic = DAC//2
 
         # Read code command
-        command = 0b1101
+        command = 0b1101                                       # 0xd
         data = bytearray([(command<<4) | address, 0, 0, 0])
 
         code_data = self.spi_rack.read_data(self.module, DAC_ic, LTC2758_MODE, LTC2758_RD_SPEED, data)
         code = (code_data[1]<<10) | (code_data[2]<<2) | (code_data[3]>>6)
 
         # Read span command
-        command = 0b1100
+        command = 0b1100                                       # 0xc
         data = bytearray([(command<<4) | address, 0, 0, 0])
 
         span_data = self.spi_rack.read_data(self.module, DAC_ic, LTC2758_MODE, LTC2758_RD_SPEED, data)
@@ -389,8 +389,8 @@ class D5a_module(object):
             raise ValueError("Span {} should not be used. Accepted values are: {}".format(span, [0, 1, 2, 3, 4]))
 
         self.voltages[DAC] = voltage
-        self.span[DAC] = span
-
+        self.spans[DAC] = span
+        
         return [voltage, span]
 
     def is_D5a_communicating(self):
@@ -429,4 +429,4 @@ class D5a_module(object):
         if (test_value != new_value):
             return 0
         else:
-            return 1
+            return 1

spirack-0.2.20/spirack/version.py

@@ -0,0 +1 @@
+__version__ = '0.2.20'

{spirack-0.2.19 → spirack-0.2.20}/spirack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spirack
-Version: 0.2.19
+Version: 0.2.20
 Summary: Drivers for the QuTech SPI-rack
 Home-page: https://github.com/qutechdev/SPI-rack
 Author: QuTech Electronics Team

spirack-0.2.19/spirack/version.py

@@ -1 +0,0 @@
-__version__ = '0.2.19'