From 4465f739d3cac2aa45f79ca5dc31231227f98084 Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-1.psi.ch>
Date: Mon, 26 Aug 2019 05:12:33 +0200
Subject: [PATCH] Script execution

---
 script/users/TUM/TUM_multi_XPS_201908.py | 51 ++++++++++++------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/script/users/TUM/TUM_multi_XPS_201908.py b/script/users/TUM/TUM_multi_XPS_201908.py
index c4bc60f6..eeea22e1 100644
--- a/script/users/TUM/TUM_multi_XPS_201908.py
+++ b/script/users/TUM/TUM_multi_XPS_201908.py
@@ -5,45 +5,45 @@ Arguments:
 LATENCY = 0.0
 MOTORS = [Eph]
 
-POSITIONS_1 = [190]
-REGION_1 = {'name': 'Br3d', 'elo': 113., 'ehi': 119., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True}
+POSITIONS_1 = [850]
+REGION_1 = {'name': 'Overveiw', 'elo': 100., 'ehi': 850., 'estep': 0.5, 'epass': 50, 'tstep': 0.5, 'iter': 1, 'cis': True}
 REGIONS_1 = [REGION_1]
 
-POSITIONS_2 = [190]
-REGION_2 = {'name': 'FE', 'elo': 184, 'ehi': 187., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True}
+POSITIONS_2 = [550]
+REGION_2 = {'name': 'N1s', 'elo': 143, 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True}
 REGIONS_2 = [REGION_2]
 
-POSITIONS_3 = [350]
-REGION_3 = {'name': 'Cl2p', 'elo': 142., 'ehi': 148., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True}
+POSITIONS_3 = [550]
+REGION_3 = {'name': 'Ag3d', 'elo': 174., 'ehi': 180., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True}
 REGIONS_3 = [REGION_3]
 
-POSITIONS_4 = [350]
-REGION_4 = {'name': 'B1s', 'elo': 153., 'ehi': 158., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True}
+POSITIONS_4 = [435]
+REGION_4 = {'name': 'C1s', 'elo': 141, 'ehi': 151., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True}
 REGIONS_4 = [REGION_4]
 
-POSITIONS_5 = [350]
-REGION_5 = {'name': 'FE', 'elo': 344, 'ehi': 347., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 20, 'cis': True}
+POSITIONS_5 = [435]
+REGION_5 = {'name': 'Ag3d', 'elo': 59., 'ehi': 66., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True}
 REGIONS_5 = [REGION_5]
 
-POSITIONS_6 = [435]
-REGION_6 = {'name': 'Ag3d', 'elo': 59., 'ehi': 66., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True}
+POSITIONS_6 = [350]
+REGION_6 = {'name': 'B1s', 'elo': 152., 'ehi': 160., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True}
 REGIONS_6 = [REGION_6]
 
-POSITIONS_7 = [435]
-REGION_7 = {'name': 'C1s', 'elo': 142., 'ehi': 151., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 15, 'cis': True}
+POSITIONS_7 = [350]
+REGION_7 = {'name': 'FE', 'elo': 344., 'ehi': 347., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 20, 'cis': True}
 REGIONS_7 = [REGION_7]
 
-POSITIONS_8 = [550]
-REGION_8 = {'name': 'N1s', 'elo': 143., 'ehi': 149., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True}
+POSITIONS_8 = [70]
+REGION_8 = {'name': 'Valence', 'elo': 55., 'ehi': 68., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True}
 REGIONS_8 = [REGION_8]
 
-POSITIONS_9 = [550]
-REGION_9 = {'name': 'Ag3d', 'elo': 174, 'ehi': 180., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True}
-REGIONS_9 = [REGION_9]
+#POSITIONS_9 = [550]
+#REGION_9 = {'name': 'Ag3d', 'elo': 174, 'ehi': 180., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True}
+#REGIONS_9 = [REGION_9]
 
-POSITIONS_10 = [70]
-REGION_10 = {'name': 'Valence', 'elo': 55., 'ehi': 67., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True}
-REGIONS_10 = [REGION_7]
+#POSITIONS_10 = [70]
+#REGION_10 = {'name': 'Valence', 'elo': 55., 'ehi': 67., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 10, 'cis': True}
+#REGIONS_10 = [REGION_10]
 
 #POSITIONS_4 = [435]
 #REGION_4 = {'name': 'Ag3d', 'elo': 59, 'ehi': 66., 'estep': 0.05, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': True}
@@ -214,7 +214,8 @@ try:
     task = fork(update_live_plots)
     # theta (polar), phi (azimuth), x, y, z
     #sample_pos = [[-9.1,-90.0,-3.45, -0.5, 115.1]]
-    sample_pos = [[-9.1,-90.0, -2.6, 0.5, 115.1]]
+    #sample_pos = [[-9.1,-90.0, -2.6, 0.5, 115.1]]
+    sample_pos = [[-9.1,-90.0, 0.45, 0.5, 115.1]]
 
     for (index, nn) in enumerate(sample_pos):
         polar = nn[0]
@@ -235,8 +236,8 @@ try:
             do_scan(MOTORS, POSITIONS_6, REGIONS_6, LATENCY, nn)
             do_scan(MOTORS, POSITIONS_7, REGIONS_7, LATENCY, nn)
             do_scan(MOTORS, POSITIONS_8, REGIONS_8, LATENCY, nn)               
-            do_scan(MOTORS, POSITIONS_9, REGIONS_9, LATENCY, nn)
-            do_scan(MOTORS, POSITIONS_10, REGIONS_10, LATENCY, nn)
+            #do_scan(MOTORS, POSITIONS_9, REGIONS_9, LATENCY, nn)
+            #do_scan(MOTORS, POSITIONS_10, REGIONS_10, LATENCY, nn)
             #o_scan(MOTORS, POSITIONS_11, REGIONS_11, LATENCY, nn)