diff --git a/script/SchofieldScan.py b/script/SchofieldScan.py index 3f40fc5a..9302efef 100644 --- a/script/SchofieldScan.py +++ b/script/SchofieldScan.py @@ -101,7 +101,7 @@ def measure_stuff(): energy_scale_table = "scan " + str(bb) + "/EnergyScale" print energy_scale_table create_dataset(energy_scale_table, 'd', dimensions=[0,9]) - #vscan(Eph, SENSORS, VECTOR, True, LATENCY,False, before_read=wait_beam, after_read = after_readout) + vscan(Eph, SENSORS, VECTOR, True, LATENCY,False, before_read=wait_beam, after_read = after_readout) toc = time.time() tictoc = round((toc-tic)/60*100)/100 print 'time taken is ', tictoc, ' minutes' @@ -113,22 +113,22 @@ SENSORS = [] print ' ######################################################' print ' ** Begin O 1s PhD **' tic_whole = time.time() -VECTOR = [ 630.0] +VECTOR = [ 638.0] for nn in range(63): VECTOR.append(VECTOR[-1]+4) pass_energy_hold = 100 -initial_energy_range = [[87.2, 95.5, 0.1], - [95.0, 105.0, 0.5]] +initial_energy_range = [[95.5, 105.0, 0.1], + [105.1, 115.0, 0.5]] angle_time = [0.4, 0.5, 0.6, 0.7] energy_scale_array = [] -azi_range = [-90., -45.] -angle_range = [-9.2, -9.2+20, -9.2+40, -9.2+60] -#measure_stuff() +azi_range = [-90.0, -45.0] +angle_range = [-9.2, -9.2+20.0, -9.2+40.0, -9.2+60.0] +measure_stuff() toc_whole = time.time() tictoc = round(toc_whole-tic_whole) print ' ** End O 1s PhD **' @@ -145,14 +145,14 @@ for nn in range(63): #nn = 0 -initial_energy_range = [[45, 52.4, 0.1], - [52.5, 62.5, 0.5]] +initial_energy_range = [[45.0, 53.0, 0.1], + [53.5, 63.0, 0.5]] pass_energy_hold = 50 -angle_time = [0.4,0.5,0.6,0.7] -azi_range = [-90., -45.] -angle_range = [-9.2, -9.2+20, -9.2+40, -9.2+60] +angle_time = [0.5,0.6,0.7,0.8] +azi_range = [-90.0, -45.0] +angle_range = [-9.2, -9.2+20.0, -9.2+40.0, -9.2+60.0] -#measure_stuff() +measure_stuff() toc_whole = time.time() tictoc = round(toc_whole-tic_whole) print ' ** time taken was ', math.floor(tictoc/3600), ' hours and ', round((tictoc-math.floor(tictoc/3600)*3600)/60), ' minutes.' @@ -169,12 +169,12 @@ for nn in range(63): #nn = 0 -initial_energy_range = [[63, 67, 0.1], +initial_energy_range = [[62.0, 67.0, 0.1], [67.5, 77, 0.5]] pass_energy_hold = 20 -angle_time = [0.4,0.5,0.6,0.7] -azi_range = [-90., -45.] -angle_range = [-9.2, -9.2+20, -9.2+40, -9.2+60] +angle_time = [0.5,0.6,0.7,0.8] +azi_range = [-90.0, -45.0] +angle_range = [-9.2, -9.2+20.0, -9.2+40.0, -9.2+60.0] measure_stuff() toc_whole = time.time()