Closedown

script/test/HoloFlyScan.py

@@ -13,7 +13,7 @@ LATENCY (float) in seconds
 SENSORS (list of devices)
 """
 
-THETA_RANGE = (-9.5, 81.5)
+THETA_RANGE = (-9.0, 81.0)
 THETA_STEP = 1.0
 PHI_RANGE = (-160.0, +160.0)
 PHI_STEP = 40.0
@@ -22,8 +22,8 @@ LATENCY = 0.0
 ZIGZAG = True
 ENDSCAN = False
 MOTORS = (ManipulatorTheta)
-SENSORS = (Counts, Scienta.spectrum, SampleCurrent, RefCurrent, MachineCurrent)
-#SENSORS = (Counts, Scienta.dataMatrix, SampleCurrent, RefCurrent, MachineCurrent)
+#SENSORS = (Counts, Scienta.spectrum, SampleCurrent, RefCurrent, MachineCurrent)
+SENSORS = (Counts, Scienta.dataMatrix, SampleCurrent, RefCurrent, MachineCurrent)
 
 #set_preference(Preference.ENABLED_PLOTS, [ManipulatorPhi, ManipulatorTheta, Scienta.dataMatrix, ImageIntegrator])
 #set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1})
@@ -55,7 +55,7 @@ try:
         try:
             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"
+            print time.time(), " cscan: exception at (theta, phi) = ({th}, {ph})".format(th=ManipulatorTheta.read(), ph=phi)
         if ZIGZAG:
             THETA_RANGE = (THETA_RANGE[1], THETA_RANGE[0])
     

script/test/ManipulatorFlyScan.py

@@ -25,7 +25,7 @@ set_adc_averaging()
 time1 = time.time()
 trig_scienta()
 time2 = time.time()
-scienta_time = (time2 - time1) #+ 1.0
+scienta_time = (time2 - time1) + 1.0
 print "scienta_time: ", scienta_time
 
 # time for one scan step in seconds