Script execution
This commit is contained in:
@@ -15,12 +15,13 @@ SENSORS (list of devices)
|
||||
|
||||
THETA_RANGE = (-9.0, 81.0)
|
||||
THETA_STEP = 1.0
|
||||
PHI_RANGE = (-160.0, +160.0)
|
||||
PHI_RANGE = (-40.0, +40.0)
|
||||
#PHI_RANGE = (-160.0, +160.0)
|
||||
PHI_STEP = 40.0
|
||||
|
||||
LATENCY = 0.0
|
||||
ZIGZAG = True
|
||||
ENDSCAN = False
|
||||
ENDSCAN = True
|
||||
MOTORS = (ManipulatorTheta)
|
||||
#SENSORS = (Counts, Scienta.spectrum, SampleCurrent, RefCurrent, MachineCurrent)
|
||||
SENSORS = (Counts, Scienta.dataMatrix, SampleCurrent, RefCurrent, MachineCurrent)
|
||||
@@ -35,7 +36,7 @@ set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
|
||||
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 theta scan in seconds
|
||||
@@ -52,10 +53,10 @@ try:
|
||||
ManipulatorPhi.write(phi)
|
||||
print "phi = ", phi
|
||||
ManipulatorPhi.waitValueInRange(phi, 1.0, 100)
|
||||
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 at (theta, phi) = ({th}, {ph})".format(th=ManipulatorTheta.read(), ph=phi)
|
||||
#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 at (theta, phi) = ({th}, {ph})".format(th=ManipulatorTheta.read(), ph=phi)
|
||||
if ZIGZAG:
|
||||
THETA_RANGE = (THETA_RANGE[1], THETA_RANGE[0])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user