Script execution
This commit is contained in:
@@ -33,7 +33,7 @@ set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
|
||||
time1 = time.time()
|
||||
trig_scienta()
|
||||
time2 = time.time()
|
||||
scienta_time = (time2 - time1) * 1.01 + 5.0
|
||||
scienta_time = (time2 - time1) + 1.0
|
||||
print "scienta_time: ", scienta_time
|
||||
|
||||
# time for one theta scan in seconds
|
||||
@@ -51,8 +51,11 @@ try:
|
||||
print "phi = ", phi
|
||||
ManipulatorPhi.waitValueInRange(phi, 1.0, 100)
|
||||
print time.time(), " cscan: start"
|
||||
cscan(ManipulatorTheta, SENSORS, THETA_RANGE[0], THETA_RANGE[1], THETA_NSTEPS, time=theta_time, before_read=before_readout, after_read = after_readout)
|
||||
print time.time(), " cscan: end"
|
||||
try:
|
||||
cscan(ManipulatorTheta, SENSORS, THETA_RANGE[0], THETA_RANGE[1], THETA_NSTEPS, time=theta_time, before_read=before_readout, after_read = after_readout)
|
||||
print time.time(), " cscan: end"
|
||||
except ContinuousScanFollowingErrorException:
|
||||
print time.time(), " cscan: exception"
|
||||
if ZIGZAG:
|
||||
THETA_RANGE = (THETA_RANGE[1], THETA_RANGE[0])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user