From e2ef73a22b5df161b5f3685012a1d4ef561a0425 Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-02.psi.ch>
Date: Mon, 11 Sep 2023 16:19:20 +0200
Subject: [PATCH] Script execution

---
 script/users/chong/MultiRegionScan.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/script/users/chong/MultiRegionScan.py b/script/users/chong/MultiRegionScan.py
index c7195c93..aa521bc4 100644
--- a/script/users/chong/MultiRegionScan.py
+++ b/script/users/chong/MultiRegionScan.py
@@ -14,7 +14,7 @@ usage:
 """
 
 # dummy scan (time series)
-MOTORS = [dummy]
+#MOTORS = [dummy]
 # photon energy scan (do not include 'ephot' in regions in this case!)
 #MOTORS = [Eph]
 # phi scan
@@ -23,9 +23,10 @@ MOTORS = [dummy]
 #MOTORS = (ManipulatorPhi, ManipulatorTheta)
 # 2D YZ scan
 #MOTORS = [ManipulatorY, ManipulatorZ]
+MOTORS = [ManipulatorZ]
 
 # line scan [start, stop, step]
-POSITIONS = [0., 50., 600]
+POSITIONS = [111,124,0.1]
 SCAN = 'lscan'
 
 # vector scan [pos1, pos2, pos3, ...]
@@ -69,7 +70,7 @@ LATENCY = 1.0
 # 'cis': True = constant initial state (photoemission line), False = constant final state (Auger peak), (default False)
 # 'slit': exit slit (default: unchanged)
 
-REGION1 = {'name': 'Second', 'elo': 7., 'ehi': 12., 'estep': 0.01,'epass': 5., 'tstep': 0.1, 'iter': 1,'slit':50}
+#REGION1 = {'name': 'Second', 'elo': 7., 'ehi': 12., 'estep': 0.01,'epass': 5., 'tstep': 0.1, 'iter': 1,'slit':50}
 #REGION1 = {'name': 'survey', 'elo': 100, 'ehi': 7409, 'estep': 0.5,'epass': 50., 'tstep': 0.2, 'iter': 3}
 #REGION01 = {'name': 'blank1', 'elo': 461, 'ehi': 462, 'estep': 1.0, 'epass': 100., 'tstep': 1.0, 'iter': 1,'slit':200}
 #REGION1c = {'name': 'c1s', 'elo': 462, 'ehi': 472, 'estep': 0.1, 'epass': 100., 'tstep': 0.1, 'iter': 1,'slit':100}
@@ -77,12 +78,15 @@ REGION1 = {'name': 'Second', 'elo': 7., 'ehi': 12., 'estep': 0.01,'epass': 5., '
 #REGION02 = {'name': 'blank2', 'elo': 461, 'ehi': 462, 'estep': 1.0, 'epass': 100., 'tstep': 1.0, 'iter': 1,'slit':20}
 #REGION3 = {'name': 'multiplet 2', 'elo': 173.5, 'ehi': 176.8, 'estep': 0.03, 'epass': 50., 'tstep': 0.12, 'iter': 1}
 
-REGION1fix = {'name': 'c1s', 'efix': 466, 'epass': 100., 'tstep': 4,'slit':200} #for 1100eV Eph use efix 810eV ,Eph=740eV use efix 451eV
-REGION2fix = {'name': 'o1s', 'efix': 217.5, 'epass': 100., 'tstep': 4,'slit':200}
+#REGION1fix = {'name': 'c1s', 'efix': 466, 'epass': 100., 'tstep': 4,'slit':200} #for 1100eV Eph use efix 810eV ,Eph=740eV use efix 451eV
+#REGION2fix = {'name': 'o1s', 'efix': 217.5, 'epass': 100., 'tstep': 4,'slit':200}
+
+REGION1fix = {'name': 'br3d', 'efix': 667.4, 'epass': 100., 'tstep': 2,'slit':200} #for 1100eV Eph use efix 810eV ,Eph=740eV use efix 451eV
+REGION2fix = {'name': 'c1s', 'efix': 452.5, 'epass': 100., 'tstep': 2,'slit':200} #for 1100eV Eph use efix 810eV ,Eph=740eV use efix 451eV
 
 # list of region dictionaries to execute at each scan position
 #REGIONS=[REGION1]
-REGIONS = [REGION1,REGION1fix, REGION2fix]
+REGIONS = [REGION1fix, REGION2fix]
 #
 #MOTORS = [Eph]
 #POSITIONS = [740., 700., 100]
@@ -210,7 +214,7 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray):
         try:
             ExitSlit.write(self.region['slit'])
             append_dataset(self.slit_dataset_name, self.region['slit'])
-            time.sleep(0.5)
+            time.sleep(1.0)
             ExitSlitY.waitReady(10000)
         except KeyError:
             pass