From 254a8458ecbe3275de5fbc992c6cf557dddbb5f4 Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-1.psi.ch>
Date: Tue, 10 Mar 2020 12:25:26 +0100
Subject: [PATCH] Closedown

---
 config/variables.properties     | 4 ++--
 script/ManipulatorScan.py       | 5 ++++-
 script/local.py                 | 3 +--
 script/test/DemoCscanPseudo1.py | 5 +++--
 script/test/DemoCscanPseudo2.py | 6 +++---
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/config/variables.properties b/config/variables.properties
index 614d7134..b2dcd760 100644
--- a/config/variables.properties
+++ b/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
diff --git a/script/ManipulatorScan.py b/script/ManipulatorScan.py
index cd9527eb..f2ed522b 100644
--- a/script/ManipulatorScan.py
+++ b/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
diff --git a/script/local.py b/script/local.py
index bb1cabb3..4f37b700 100644
--- a/script/local.py
+++ b/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:     
diff --git a/script/test/DemoCscanPseudo1.py b/script/test/DemoCscanPseudo1.py
index 6c74a3cb..7c055b47 100644
--- a/script/test/DemoCscanPseudo1.py
+++ b/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)
diff --git a/script/test/DemoCscanPseudo2.py b/script/test/DemoCscanPseudo2.py
index 79ab3f8b..af8a7119 100644
--- a/script/test/DemoCscanPseudo2.py
+++ b/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)