From 1434838df3159ca5436bfd268e3d1e1fd9eb6d9b Mon Sep 17 00:00:00 2001 From: x03daop Date: Fri, 5 Aug 2016 14:01:53 +0200 Subject: [PATCH] Script execution --- script/SchofieldScan.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/script/SchofieldScan.py b/script/SchofieldScan.py index cddcc2f8..0a96db39 100644 --- a/script/SchofieldScan.py +++ b/script/SchofieldScan.py @@ -12,8 +12,8 @@ tic = time.time() LATENCY = 0.0 VECTOR = [ 630.0] -for nn in range(63): - VECTOR.append(VECTOR[-1]+4) +#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]] @@ -98,12 +98,12 @@ set_adc_averaging() set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1}) 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]) - print 'current theta is ', ManipulatorTheta.take(), ' and current azimuth is ' , ManipulatorPhi.take() - #vscan(Eph, SENSORS, VECTOR, True, LATENCY,False, before_read=wait_beam, after_read = after_readout) +# for ll in range(len(azi_range)): +# ManipulatorPhi.move(azi_range[ll]) +# for nn in range(len(angle_range)): +# ManipulatorTheta.move(angle_range[nn]) +# print 'current theta is ', ManipulatorTheta.take(), ' and current azimuth is ' , ManipulatorPhi.take() + vscan(Eph, SENSORS, VECTOR, True, LATENCY,False, before_read=wait_beam, after_read = after_readout) finally: if ENDSCAN: after_scan()