Closedown

script/test/HoloFlyScan.py

@@ -1,25 +1,27 @@
 """
-Flying hologram scan (work in progress)
+Flying hologram scan (experimental)
 
 Arguments:
 
-PHI_RANGE (tuple (min, max))
 THETA_RANGE  (tuple (min, max))
-STEPS  (tuple (phi, theta))
+PHI_RANGE (tuple (min, max))
+THETA_STEP (scalar)
+PHI_STEP (scalar)
 
-SENSORS (list)
 ZIGZAG (BOOLEAN)
+LATENCY (float) in seconds
+SENSORS (list of devices)
 """
 
-THETA_RANGE = (-9.0, 1.0)
+THETA_RANGE = (-9.5, 81.5)
 THETA_STEP = 1.0
-PHI_RANGE = (-10.0, +10.0)
-PHI_STEP = 10.0
+PHI_RANGE = (-160.0, +160.0)
+PHI_STEP = 40.0
 
 LATENCY = 0.0
 ZIGZAG = True
 ENDSCAN = False
-MOTORS = (ManipulatorZ, ManipulatorY)
+MOTORS = (ManipulatorTheta)
 SENSORS = (Counts, Scienta.spectrum, SampleCurrent, RefCurrent, MachineCurrent)
 #SENSORS = (Counts, Scienta.dataMatrix, SampleCurrent, RefCurrent, MachineCurrent)
 
@@ -50,10 +52,8 @@ try:
         ManipulatorPhi.write(phi)
         print "phi = ", phi
         ManipulatorPhi.waitValueInRange(phi, 1.0, 100)
-        print time.time(), " cscan: start"
         try:
-            cscan(ManipulatorTheta, SENSORS, THETA_RANGE[0], THETA_RANGE[1], THETA_NSTEPS - 1, time=theta_time, before_read=before_readout, after_read = after_readout)
-            print time.time(), " cscan: end"
+            cscan(MOTORS, SENSORS, THETA_RANGE[0], THETA_RANGE[1], THETA_NSTEPS - 1, time=theta_time, before_read=before_readout, after_read = after_readout)
         except ContinuousScanFollowingErrorException:
             print time.time(), " cscan: exception"
         if ZIGZAG: