Script execution

script/SchofieldScan.py

@@ -8,18 +8,37 @@ MODE ('fixed' or 'swept')
 TYPE ('CIS' or 'CFS')
 STEP (double)
 """
-tic = time.time()
+
 LATENCY = 0.0
 
-VECTOR = [ 630.0]
+
+#################### C 1s PhD scan ##############################
+VECTOR = [ 340.0]
+#for nn in range(63):
+#    VECTOR.append(VECTOR[-1]+4)
+nn = 0
+
+
+initial_energy_range = [[45, 51.9, 0.1], 
+                        [52, 62, 0.5]]
+
+angle_time = [0.3, 0.4, 0.5, 0.6]
+#angle_range = [-9.2+20., -9.2+40., -9.2+60.]
+#azi_range = [-90., -45.]
+
+#################### O 1s PhD scan ##############################
+#VECTOR = [ 630.0]
 #for nn in range(63):
 #    VECTOR.append(VECTOR[-1]+4)
 
-initial_energy_range = [[87.2, 95.5, 0.1], 
-                        [95.0, 105.0, 0.5]]
 
-angle_range = [-9.2+20., -9.2+40., -9.2+60.]
-azi_range = [-90., -45.]
+
+#initial_energy_range = [[87.2, 95.5, 0.1], 
+#                        [95.0, 105.0, 0.5]]
+
+#angle_time = [0.3, 0.4, 0.5, 0.6]
+#angle_range = [-9.2+20., -9.2+40., -9.2+60.]
+#azi_range = [-90., -45.]
 
 
 class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray):
@@ -101,13 +120,18 @@ try:
 #    for ll in range(len(azi_range)):
 #        ManipulatorPhi.move(azi_range[ll])
 #        for nn in range(len(angle_range)):
-#            ManipulatorTheta.move(angle_range[nn])
+            tic = time.time()
+            ManipulatorTheta.move(angle_range[nn])
 #            print 'current theta is ', ManipulatorTheta.take(), ' and current azimuth is ' , ManipulatorPhi.take()
+#            Scienta.getStepTime().write(angle_time[nn])
+#            sleep(1)
             vscan(Eph, SENSORS, VECTOR, True, LATENCY,False, before_read=wait_beam, after_read = after_readout)
+            toc = time.time()
+            tictoc = round((toc-tic)/60*100)/100
+            print 'time taken is ', tictoc, ' minutes'
 finally:
     if ENDSCAN:
         after_scan()    
 
 toc = time.time()
-tictoc = round((toc-tic)/60*100)/100
-print 'time taken is ', tictoc, ' minutes'
+