From 2886d1bb6b3663a54895f23927d9b065926261f9 Mon Sep 17 00:00:00 2001 From: x03daop Date: Sun, 7 Aug 2016 10:07:10 +0200 Subject: [PATCH] Script execution --- script/SchofieldScan.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/script/SchofieldScan.py b/script/SchofieldScan.py index 9302efef..8702cc0a 100644 --- a/script/SchofieldScan.py +++ b/script/SchofieldScan.py @@ -122,13 +122,21 @@ pass_energy_hold = 100 initial_energy_range = [[95.5, 105.0, 0.1], [105.1, 115.0, 0.5]] +angle_time = [0.6] +energy_scale_array = [] +azi_range = [-90.0] +angle_range = [-9.2+60.0] -angle_time = [0.4, 0.5, 0.6, 0.7] +measure_stuff() + +angle_time = [0.3, 0.4, 0.5, 0.6] energy_scale_array = [] -azi_range = [-90.0, -45.0] +azi_range = [-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 **' @@ -148,7 +156,7 @@ for nn in range(63): initial_energy_range = [[45.0, 53.0, 0.1], [53.5, 63.0, 0.5]] pass_energy_hold = 50 -angle_time = [0.5,0.6,0.7,0.8] +angle_time = [0.4,0.5,0.6,0.7] azi_range = [-90.0, -45.0] angle_range = [-9.2, -9.2+20.0, -9.2+40.0, -9.2+60.0] @@ -172,8 +180,8 @@ for nn in range(63): initial_energy_range = [[62.0, 67.0, 0.1], [67.5, 77, 0.5]] pass_energy_hold = 20 -angle_time = [0.5,0.6,0.7,0.8] -azi_range = [-90.0, -45.0] +angle_time = [0.4,0.5,0.6,0.7] +azi_range = [-90.0,-45.0] angle_range = [-9.2, -9.2+20.0, -9.2+40.0, -9.2+60.0] measure_stuff()