From 157e0730f889374716c036b307c44685d1bc6c01 Mon Sep 17 00:00:00 2001
From: x03daop <x03daop@x03da-cons-1.psi.ch>
Date: Sat, 6 Aug 2016 09:05:14 +0200
Subject: [PATCH] Script execution

---
 script/SchofieldScan.py | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/script/SchofieldScan.py b/script/SchofieldScan.py
index 5d1a3db0..f4a6c4e8 100644
--- a/script/SchofieldScan.py
+++ b/script/SchofieldScan.py
@@ -91,7 +91,6 @@ def measure_stuff():
     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 jj in range(len(angle_range)):
@@ -106,10 +105,7 @@ def measure_stuff():
                 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'
-    finally:
-        if ENDSCAN:
-            after_scan()    
+                print 'time taken is ', tictoc, ' minutes' 
             
 global initial_energy_range,energy_scale_array, energy_scale_table, VECTOR,pass_energy_hold,angle_time,angle_range,azi_range,SENSORS
 bb = 0
@@ -129,17 +125,11 @@ initial_energy_range = [[87.2, 95.5, 0.1],
                         [95.0, 105.0, 0.5]]
 
 angle_time = [0.4, 0.5, 0.6]
-angle_range = [-9.2+20., -9.2+40., -9.2+60.]
-azi_range = [-45.]
 energy_scale_array = []
 
-measure_stuff()
 azi_range = [-45.]
 angle_range = [-9.2]
 measure_stuff()
-azi_range = [-90.]
-angle_range = [-9.2+60.]
-measure_stuff()
 toc_whole = time.time()
 tictoc = round(toc_whole-tic_whole)
 print ' **            End O 1s PhD                          **'
@@ -160,9 +150,9 @@ for nn in range(63):
 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.]
+angle_time = [0.4]
+angle_range = [-9.2]
+azi_range = [-90.]
 
 measure_stuff()
 toc_whole = time.time()
@@ -184,8 +174,8 @@ for nn in range(63):
 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.]
+angle_time = [0.4]
+angle_range = [-9.2]
 azi_range = [-90.]
 
 measure_stuff()