minor changes, feedforward output is now 0

myGUI.py

@@ -101,7 +101,7 @@ class GuiMainWindow(QMainWindow):
         self.piezoB397 = anal_control_signal('piezoB397', 7, out_step = 0.01)
         self.piezoA866 = anal_control_signal('piezoA866', 14, out_minimum=0, out_maximum=4, out_step=0.01)
         self.piezoB866 = anal_control_signal('piezoB866', 6, out_step = 0.01)
-        self.piezoA423 = anal_control_signal('piezoA423', 1, out_step = 0.01, feedfoward_channel=8)
+        self.piezoA423 = anal_control_signal('piezoA423', 1, out_step = 0.01, feedfoward_channel=0)
         
         self.trapDCA = anal_control_signal('DC A', 2)
         self.trapDCB = anal_control_signal('DC B', 3)

myWidgets.py

@@ -20,7 +20,7 @@ import scanFunctions
 class anal_control_signal(QWidget):
     _registry = []
     
-    def __init__(self, name, channel, out_minimum = -10, out_maximum = 10, out_step = 0.1, feedfoward_channel = None):
+    def __init__(self, name, channel, out_minimum = -10, out_maximum = 10, out_step = 0.1, feedfoward_channel = 0):
         super().__init__()
         
         self._registry.append(self)
@@ -40,7 +40,7 @@ class anal_control_signal(QWidget):
         self.sb = pg.SpinBox(value = self.initial_value, bounds=[self.min, self.max], step = self.step, siPrefix = self.siPrefix, suffix = self.suffix)
         try:
             self.AO = daq_AO(self.ch)
-            if feedfoward_channel:
+            if feedfoward_channel == 0:
                 self.AO_feedfoward = daq_AO(self.feedfoward_channel)
         except:
             show_warning('Analog output %i not found. Daq might not be connected' % self.ch)
@@ -60,7 +60,7 @@ class anal_control_signal(QWidget):
 
         self.scan_sb_start =  pg.SpinBox(value = 0, bounds=[self.min, self.max], step = self.step, siPrefix = self.siPrefix, suffix = self.suffix)
         self.scan_sb_stop =    pg.SpinBox(value = 0, bounds=[self.min, self.max], step = self.step, siPrefix = self.siPrefix, suffix = self.suffix)
-        self.scan_sb_period = pg.SpinBox(value = 1, bounds=[0, 100], step = 0.1, siPrefix = True, suffix = 's')
+        self.scan_sb_period = pg.SpinBox(value = 1, bounds=[0, 300], step = 0.1, siPrefix = True, suffix = 's')
         
         
         self.scan_button.clicked.connect(self.doScanAction)
@@ -74,7 +74,7 @@ class anal_control_signal(QWidget):
         self.scan_sb_stop.setMinimumHeight(22)
         
         self.scan_feedfoward_button = QCheckBox('Feedfoward')
-        self.scan_feedfoward_sb = pg.SpinBox(value = 0, bounds=[0, 1], step = 0.02)
+        self.scan_feedfoward_sb = pg.SpinBox(value = 0, bounds=[0, 0.005], step = 0.0005)
         self.scan_feedfoward_sb.setMinimumHeight(22)
         self.scan_feedfoward_step = 0
         self.scan_feedfoward_analogOut = None