Changeset 750 in ETALON

Timestamp:

Nov 29, 2017, 10:01:44 AM (6 years ago)

Author:

delerue

Message:

CLIO graphical interface and analysis updated

File:

• CLIO/control/CLIO_graphical_interface.py (modified) (5 diffs)

CLIO/control/CLIO_graphical_interface.py

@@ -78 +78 @@
         self.scanStep=10000
         self.scanNextStep=0
-        self.scanDuration=0
+        self.scanDuration=10
         self.scanWaitUntil=0
         
@@ -398 +398 @@
             fid.close()
             if key_values['motor_value']:
-                self.labelPositionStep.config(text=key_values['motor_value']);
+                self.labelPositionStep.config(text=key_values['motor_value']+' stp');
                 self.labelPositionStep.config(bg='green',fg='black');
             else:
@@ -404 +404 @@
 
             if key_values['current_value']:
-                self.labelPositionCurrent.config(text=key_values['current_value']);
+                self.labelPositionCurrent.config(text=key_values['current_value']+' [cur]');
                 self.labelPositionCurrent.config(bg='green',fg='black');
             else:
@@ -426 +426 @@
     def onButtonRetract(self):
         print "Move motor Retract"        
-        fid=open(motor_position_request,'w')
-        fid.write("abs0;\n")
+        self.moveMotorAbsolute(0)
+
+    def onButtonInsert1(self):
+        print "Move motor Insert "+str(INSERTED_VALUE1)
+        self.moveMotorAbsolute(INSERTED_VALUE1)
+
+    def moveMotorAbsolute(self,pos_value):
         self.labelPositionCurrent.config(bg='cyan');
         self.labelPositionStep.config(bg='cyan');
+        fid=open(motor_position_request,'w')
+        fid.write("abs"+str(pos_value)+";\n")
         fid.close()
-
-    def onButtonInsert1(self):
-        print "Move motor Insert "+str(INSERTED_VALUE1)        
-        fid=open(motor_position_request,'w')
-        fid.write("abs"+str(INSERTED_VALUE1)+";\n")
-        fid.close()
-        self.labelPositionCurrent.config(bg='cyan');
-        self.labelPositionStep.config(bg='cyan');
-
+        
     def moveMotor(self,direction,step):
         if ((direction!=0)and(step>0)):
@@ -530 +529 @@
         self.scanStop=int(self.buttonValueStop.get("1.0","end-1c"))
         self.scanStep=int(self.buttonValueStep.get("1.0","end-1c"))
+        self.scanDuration=int(self.buttonValueDuration.get("1.0","end-1c"))
         self.scanNextStep=0
-        self.scanDuration=0
         self.scanWaitUntil=0
         self.scanON=startScan
         self.popup.destroy()
+        if (self.scanON):
+            self.moveMotorAbsolute(self.scanStart)
+            self.scanNextStep=self.scanStart
+            
         
     def scanCheck(self):
         if (self.scanON):
             print "Scan in progress"
+            #Are we at the target position?
+            if (int((self.labelPositionStep.text[:-4]).strip())==self.scanNextStep):
+                #If yes, are we waiting
+                if self.scanWaitUntil==0:
+                    #No => wait
+                    self.scanWaitUntil=time.time()+self.scanDuration
+                else:
+                    #yes => did we finish waiting?
+                    if (time.time()>self.scanWaitUntil):
+                        #yes: Are we still below the last position?
+                        if (self.scanNextStep<self.scanStop):
+                            self.scanNextStep=self.scanNextStep+self.scanStep
+                            self.moveMotorAbsolute(self.scanNextStep)
+                            self.scanWaitUntil=0
+                        else:
+                            print "Scan finished"
+                            self.scanON=False
+                    else:
+                        print "Taking data..."
+                        
         else:
             print "No scan"