diff --git a/script/test/HoloFlyScan.py b/script/test/HoloFlyScan.py index 0bace77c..6e1ae724 100644 --- a/script/test/HoloFlyScan.py +++ b/script/test/HoloFlyScan.py @@ -3,13 +3,25 @@ Flying hologram scan (work in progress) Arguments: -SENSORS (list) PHI_RANGE (tuple (min, max)) THETA_RANGE (tuple (min, max)) STEPS (tuple (phi, theta)) + +SENSORS (list) ZIGZAG (BOOLEAN) """ +THETA_RANGE = (-9.0, 1.0) +THETA_STEP = 1.0 +PHI_RANGE = (-10.0, +10.0) +PHI_STEP = 10.0 + +LATENCY = 0.0 +ZIGZAG = True +ENDSCAN = False +MOTORS = (ManipulatorZ, ManipulatorY) +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}) @@ -22,10 +34,12 @@ time1 = time.time() trig_scienta() time2 = time.time() scienta_time = (time2 - time1) * 1.01 +print "scienta_time: ", scienta_time # time for one theta scan in seconds THETA_NSTEPS = round((THETA_RANGE[1] - THETA_RANGE[0]) / THETA_STEP) + 1 -theta_time = scienta_time * THETA_STEPS +theta_time = scienta_time * THETA_NSTEPS +print "theta_time: ", scienta_time PHI_STEP = 40.0 PHI_NSTEPS = round((PHI_RANGE[1] - PHI_RANGE[0]) / PHI_STEP) + 1