From 4f0af48cd308313b694bf5f0afe2ba0df0a8a2e8 Mon Sep 17 00:00:00 2001 From: x03daop Date: Sat, 6 Aug 2016 13:24:49 +0200 Subject: [PATCH] Script execution --- script/SchofieldScan.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/script/SchofieldScan.py b/script/SchofieldScan.py index e25a45ff..94120e62 100644 --- a/script/SchofieldScan.py +++ b/script/SchofieldScan.py @@ -133,7 +133,7 @@ angle_range = [-9.2] toc_whole = time.time() tictoc = round(toc_whole-tic_whole) print ' ** End O 1s PhD **' -print ' ** time taken was ', math.floor(tictoc/3600), ' hours and ', round(tictoc-math.floor(tictoc/3600)*3600), ' minutes.' +print ' ** time taken was ', math.floor(tictoc/3600), ' hours and ', round((tictoc-math.floor(tictoc/3600)*3600)/60), ' minutes.' print ' ######################################################' @@ -150,14 +150,14 @@ for nn in range(63): initial_energy_range = [[63, 67, 0.1], [67.5, 77, 0.5]] pass_energy_hold = 20 -angle_time = [0.4] -angle_range = [-9.2] -azi_range = [-90.] +angle_time = [0.5 0.6] +angle_range = [-9.2+20 -9.2+40] +azi_range = [-90. -45] 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), ' minutes.' +print ' ** time taken was ', math.floor(tictoc/3600), ' hours and ', round((tictoc-math.floor(tictoc/3600)*3600)/60), ' minutes.' print ' ** End Si 2p PhD **' print ' ######################################################' @@ -178,10 +178,10 @@ angle_time = [0.4] angle_range = [-9.2] azi_range = [-90.] -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), ' minutes.' +print ' ** time taken was ', math.floor(tictoc/3600), ' hours and ', round((tictoc-math.floor(tictoc/3600)*3600)/60), ' minutes.' print ' ** End C 1s PhD **' print ' ######################################################' #toc = time.time()