measurement now goes back to initial value at the end

cameraGui.py

@@ -296,9 +296,6 @@ class CameraGuiMainWindow(QMainWindow):
         
         for l in LaserControlLayout._registry + LaserScanLayout._registry :
             l.unfreeze()
-            for sb_name, sb in l.spinboxes.items():
-                if sb_name == scanned_sb_name:
-                    sb.setValue(self.measurementFrame.endValue.value())
             
         print('gui meas end')
 

drivers/ADoutputs.py

@@ -96,6 +96,11 @@ class daq_AO(object):
             self.current_value = value
             return value, self.out_num
     
+    def get_current_value(self):
+        return self.current_value
+
+
+
 class daq_DO(object):
     def __init__(self, out_num):
         global daqfound

drivers/ADoutputs_linux.py

@@ -95,6 +95,8 @@ class daq_AO(object):
         except:
             raise("Failing to set analog output %i", self.out_num)
     
+    def get_current_value(self):
+        return self.current_value
 #    def set_out(self, value):
 #        print('Analog out %i set to %f' % (self.out_num, value) )
 #        return value, self.out_num

zylaCameraWorker.py

@@ -133,6 +133,7 @@ class CameraWorker(QtCore.QObject):
         self.measurementStartingSignal.emit()  
         
         self.ao_to_scan = self.get_scan_signal(measure_params['signal_to_scan'])
+        self.ao_initial_value = self.ao_to_scan.AO.get_current_value()
         self.measure_params = measure_params
         start = self.measure_params['start']
         end = self.measure_params['end']
@@ -160,7 +161,7 @@ class CameraWorker(QtCore.QObject):
         self.measurementEndingSignal.emit()  
         self.cam.trigger()
         self._stop_acquisition_loop()
-        self.ao_to_scan.go_softly_to_value(self.measure_params['end'])     
+        self.ao_to_scan.go_softly_to_value(self.ao_initial_value)     
         self.cam.TriggerMode.setString('Internal')
         print('exiting scan ending in worker')