diff --git a/script/SchofieldScan.py b/script/SchofieldScan.py index a7232ab8..cf6dd4a3 100644 --- a/script/SchofieldScan.py +++ b/script/SchofieldScan.py @@ -91,12 +91,12 @@ def measure_stuff(): 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)): + for ll in range(len(azi_range)): + ManipulatorPhi.move(azi_range[ll]) + for jj in range(len(angle_range)): tic = time.time() - # ManipulatorTheta.move(angle_range[nn]) - # print 'current theta is ', ManipulatorTheta.take(), ' and current azimuth is ' , ManipulatorPhi.take() + ManipulatorTheta.move(angle_range[jj]) + print 'current theta is ', ManipulatorTheta.take(), ' and current azimuth is ' , ManipulatorPhi.take() Scienta.setPassEnergy(pass_energy_hold) Scienta.getStepTime().write(angle_time[nn]) sleep(1) @@ -109,42 +109,15 @@ def measure_stuff(): after_scan() global initial_energy_range,energy_scale_array, energy_scale_table, VECTOR,pass_energy_hold,angle_time,angle_range,azi_range -#################### Si 2p PhD scan ############################## -VECTOR = [ 170.0,174] -#for nn in range(63): -# VECTOR.append(VECTOR[-1]+4) -#nn = 0 - - -initial_energy_range = [[63, 67, 0.1], - [67.5, 77, 0.5]] -pass_energy_hold = 20 -angle_time = [0.5, 0.6, 0.7] -angle_range = [-9.2, -9.2+30. -9.2+60.] -azi_range = [-90., -45.] - -measure_stuff() - -#################### C 1s PhD scan ############################## -VECTOR = [ 340.0,344] -#for nn in range(63): -# VECTOR.append(VECTOR[-1]+4) -#nn = 0 - - -initial_energy_range = [[45, 52.4, 0.1], - [52.5, 62.5, 0.5]] -pass_energy_hold = 50 -angle_time = [0.6, 0.7] -angle_range = [-9.2, -9.2+30.] -azi_range = [-90., -45.] - -measure_stuff() #################### O 1s PhD scan ############################## -VECTOR = [ 630.0,634] -#for nn in range(63): -# VECTOR.append(VECTOR[-1]+4) +print ' ######################################################' +print ' ** Begin O 1s PhD **' +tic_whole = time.time() +VECTOR = [ 630.0] +for nn in range(63): + VECTOR.append(VECTOR[-1]+4) + pass_energy_hold = 100 @@ -157,5 +130,62 @@ azi_range = [-90., -45.] energy_scale_array = [] measure_stuff() +azi_range = [45.] +angle_range = [-9.2] +measure_stuff() +toc_whole = time.time() +tictoc = round(toc_whole-tic_whole) +print ' ** End O 1s PhD **' +print ' ** time taken was ', floor(tictoc/3600), ' hours and ', round(tictoc-floor(tictoc/3600)*3600), ' minutes.' +print ' ######################################################' + + +#################### Si 2p PhD scan ############################## +print ' ######################################################' +print ' ** Begin Si 2p PhD **' +tic_whole = time.time() +VECTOR = [ 170.0] +for nn in range(63): + VECTOR.append(VECTOR[-1]+4) +#nn = 0 + + +initial_energy_range = [[63, 67, 0.1], + [67.5, 77, 0.5]] +pass_energy_hold = 20 +angle_time = [0.5, 0.6, 0.7] +angle_range = [-9.2, -9.2+30. -9.2+60.] +azi_range = [-90., -45.] + +measure_stuff() +toc_whole = time.time() +tictoc = round(toc_whole-tic_whole) +print ' ** time taken was ', floor(tictoc/3600), ' hours and ', round(tictoc-floor(tictoc/3600)*3600), ' minutes.' +print ' ** End Si 2p PhD **' +print ' ######################################################' + +#################### C 1s PhD scan ############################## +print ' ######################################################' +print ' ** Begin C 1s PhD **' +tic_whole = time.time() +VECTOR = [ 340.0] +for nn in range(63): + VECTOR.append(VECTOR[-1]+4) +#nn = 0 + + +initial_energy_range = [[45, 52.4, 0.1], + [52.5, 62.5, 0.5]] +pass_energy_hold = 50 +angle_time = [0.6, 0.7] +angle_range = [-9.2, -9.2+30.] +azi_range = [-90.] + +measure_stuff() +toc_whole = time.time() +tictoc = round(toc_whole-tic_whole) +print ' ** time taken was ', floor(tictoc/3600), ' hours and ', round(tictoc-floor(tictoc/3600)*3600), ' minutes.' +print ' ** End C 1s PhD **' +print ' ######################################################' #toc = time.time()