From e0b052e9374caf61518522f8953a55f1ff9c4a86 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Mon, 8 May 2023 23:58:56 +0200 Subject: [PATCH] Script execution --- .../msft-constantinou_p/MultiRegionScan_G2qXPS.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/script/users/msft-constantinou_p/MultiRegionScan_G2qXPS.py b/script/users/msft-constantinou_p/MultiRegionScan_G2qXPS.py index 6a3c9b62..073d1d5b 100644 --- a/script/users/msft-constantinou_p/MultiRegionScan_G2qXPS.py +++ b/script/users/msft-constantinou_p/MultiRegionScan_G2qXPS.py @@ -48,8 +48,8 @@ LATENCY = 0.0 # 'slit': exit slit (default: unchanged) # 'position': 'reference' or 'sample' -REFERENCE_POSITION = {'X': 2.15,'Y': 7.00, 'Z': 114.00, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} -SAMPLE_POSITION = {'X': 2.15,'Y': 3.00, 'Z': 114.00, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} +REFERENCE_POSITION = {'X': 2.25,'Y': 7.70, 'Z': 114.00, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} +SAMPLE_POSITION = {'X': 2.25,'Y': 3.00, 'Z': 114.00, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} # DEFINE THE REGIONS # -- Region A @ 578 eV Survey @@ -58,15 +58,15 @@ REGION_A2 = {'name': 'Survey', 'elo': 410., 'ehi':578., 'estep':0.05, 'epass': 5 # -- Region B @ 578 eV Peaks REGION_B1 = {'name': 'MoEF', 'ephot': 578., 'elo': 572., 'ehi':575., 'estep': 0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION_B2 = {'name': 'In4d', 'elo': 551., 'ehi':559., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_B3 = {'name': 'As3d', 'elo': 529., 'ehi':535., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION_B4 = {'name': 'In3d', 'elo': 118., 'ehi':133., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B2 = {'name': 'In4d', 'elo': 551., 'ehi':559., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B3 = {'name': 'As3d', 'elo': 529., 'ehi':535., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION_B4 = {'name': 'In3d', 'elo': 118., 'ehi':133., 'estep':0.02, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'cis': False, 'position': 'sample'} -# -- Region D @ 1050 eV Survey +# -- Region C @ 1050 eV Survey REGION_C1 = {'name': 'MoEF', 'ephot': 1050., 'elo': 1044., 'ehi':1047., 'estep':0.02, 'epass': 50., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'reference'} REGION_C2 = {'name': 'Survey', 'elo': 300., 'ehi':1050., 'estep':0.20, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -# -- Region C @ 1050 eV Peaks +# -- Region D @ 1050 eV Peaks REGION_D1 = {'name': 'MoEF', 'ephot': 1050., 'elo': 1044., 'ehi':1047., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'reference'} REGION_D2 = {'name': 'In4d', 'elo': 1024., 'ehi':1032., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'} REGION_D3 = {'name': 'As3d', 'elo': 1001., 'ehi':1008., 'estep':0.02, 'epass': 20., 'tstep': 1.0, 'iter': 1, 'cis': False, 'position': 'sample'}