Closedown

config/variables.properties

@@ -1,2 +1,2 @@
-#Tue Mar 10 11:07:20 CET 2020
-FileSequentialNumber=3201
+#Tue Mar 10 12:24:57 CET 2020
+FileSequentialNumber=3245

script/ManipulatorScan.py

@@ -17,16 +17,19 @@ set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
 
 try:
     if FLY_SCAN:        
+        print "start ", STEPS
         # time per scienta acquisition in seconds
         time1 = time.time()
         trig_scienta()
+        time.sleep(0.2)
         time2 = time.time()
         scienta_time = (time2 - time1)
         print "scienta time: ", scienta_time        
         
         if isinstance(STEPS,int):
             raise Exception ("Fly Scan must define step size, and not number of steps")
-        STEP = STEPS
+            
+        STEP = STEPS[0]
         SPEED = STEP / scienta_time
         fly_time = (RANGE[1] - RANGE[0]) / SPEED
         STEPS = int(fly_time / scienta_time) + 1

script/local.py

@@ -301,7 +301,7 @@ def before_readout():
         if dev in SENSORS:
             sample_scienta = True        
             break
-    """
+
     wait_beam()
     trig_keithleys()        
     if sample_scienta:
@@ -309,7 +309,6 @@ def before_readout():
     else:
         wait_keithleys()
     fetch_keithleys()
-    """
 
 def after_readout(rec):
     if beam_ok:     

script/test/DemoCscanPseudo1.py

@@ -2,7 +2,8 @@ import ch.psi.pshell.device.ControlledSpeedable as ControlledSpeedable
 
 
 class PseudoMotor(RegisterBase, ControlledSpeedable):    
-    def __init__(self):
+    def __init__(self, name):
+        RegisterBase.__init__(self, name)
         self.velocity = self.getDefaultSpeed()
         self.readback  = 0.0
         self.setpoint  = 0.0
@@ -34,7 +35,7 @@ class PseudoMotor(RegisterBase, ControlledSpeedable):
     def getMaxSpeed(self):
         return 10.0
         
-positioner =  PseudoMotor()       
+positioner =  PseudoMotor("PseudoMotor")       
 add_device(positioner, True);
 
 cscan(positioner, MachineCurrent, 0, 10, 1.0, time=5.0)

script/test/DemoCscanPseudo2.py

@@ -2,7 +2,8 @@ import ch.psi.pshell.device.Speedable as Speedable
 
 
 class PseudoMotor(RegisterBase, Speedable):    
-    def __init__(self):
+    def __init__(self, name):
+        RegisterBase.__init__(self, name)
         self.readback  = 0.0
         self.setpoint  = 0.0
         self.settime = time.time()
@@ -21,9 +22,8 @@ class PseudoMotor(RegisterBase, Speedable):
     def getSpeed(self):
         return 3.0
         
-positioner =  PseudoMotor()       
+positioner =  PseudoMotor("PseudoMotor")       
 add_device(positioner, True);
 
-show_panel(positioner)
 cscan(positioner, MachineCurrent, 0, 10, 1.0)