From 3c3d951adf1a805073ab354ccb4ac8215c5ed652 Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-1.psi.ch>
Date: Thu, 4 Oct 2018 11:01:47 +0200
Subject: [PATCH] Script execution

---
 script/users/TUM_multi_XPS.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/script/users/TUM_multi_XPS.py b/script/users/TUM_multi_XPS.py
index b1324d7f..396c188f 100644
--- a/script/users/TUM_multi_XPS.py
+++ b/script/users/TUM_multi_XPS.py
@@ -9,9 +9,9 @@ MOTORS = [Eph]
 #262eV : KE = 70eV for B 1s
 #200eV : KE = 70eV for Ge 3p
 
-POSITIONS_QUICK = [435]
-REGION_QUICK = {'name': 'QUICK', 'elo': 398., 'ehi': 405., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True}
-REGIONS_QUICK = [REGION_QUICK]
+#POSITIONS_QUICK = [435]
+#REGION_QUICK = {'name': 'QUICK', 'elo': 398., 'ehi': 405., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True}
+#REGIONS_QUICK = [REGION_QUICK]
 
 POSITIONS_1 = [435]
 REGION_1 = {'name': 'Ge 3d', 'elo': 398., 'ehi': 405., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True}
@@ -32,11 +32,11 @@ REGION_4 = {'name': 'Si 2s', 'elo': 140., 'ehi': 150., 'estep': 0.05, 'epass': 1
 REGIONS_4 = [REGION_4]
 
 POSITIONS_5 = [300]
-REGION_5 = {'name': 'Cu 3p', 'elo': 210., 'ehi': 230., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 6, 'cis': True}
+REGION_5 = {'name': 'Cu 3p', 'elo': 210., 'ehi': 230., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 8, 'cis': True}
 REGIONS_5 = [REGION_5]
 
 POSITIONS_6 = [70]
-REGION_6 = {'name': 'VB', 'elo': 55., 'ehi': 68., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 7, 'cis': True}
+REGION_6 = {'name': 'VB', 'elo': 55., 'ehi': 68., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True}
 REGIONS_6 = [REGION_6]
 
 CLOSE_SHUTTER_AT_END = True
@@ -192,6 +192,8 @@ try:
     task = fork(update_live_plots)
     # theta (polar), phi (azimuth), x, y, z
     sample_pos = [[-9.1,-90.0,0.7, -0.4, 115.0],
+                  [-9.1,-90.0,0.6, -0.4, 116.0],
+                  [-9.1,-90.0,0.5, -0.5, 116.0],
                   [-9.1,-90.0,0.5, -0.4, 116.0]]
 
     for (index, nn) in enumerate(sample_pos):
@@ -207,11 +209,15 @@ try:
             #do_scan(MOTORS, POSITIONS_QUICK, REGIONS_QUICK, LATENCY, nn)
             do_scan(MOTORS, POSITIONS_1, REGIONS_1, LATENCY, nn)
             do_scan(MOTORS, POSITIONS_2, REGIONS_2, LATENCY, nn)
-            do_scan(MOTORS, POSITIONS_3, REGIONS_3, LATENCY, nn)
+            
         elif index == 1:
             #do_scan(MOTORS, POSITIONS_QUICK, REGIONS_QUICK, LATENCY, nn)
-            do_scan(MOTORS, POSITIONS_4, REGIONS_4, LATENCY, nn)
+            do_scan(MOTORS, POSITIONS_3, REGIONS_3, LATENCY, nn)
+            
+        elif index == 2:  
+            do_scan(MOTORS, POSITIONS_4, REGIONS_4, LATENCY, nn) 
             do_scan(MOTORS, POSITIONS_5, REGIONS_5, LATENCY, nn)
+        elif index == 3:
             do_scan(MOTORS, POSITIONS_6, REGIONS_6, LATENCY, nn)
   
 finally: