From 834ac6994efe4431f56733073d02b4a72403ae8e Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Tue, 5 Mar 2019 20:19:08 +0100 Subject: [PATCH] Script execution --- script/users/X-Treme_XPSScan.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/script/users/X-Treme_XPSScan.py b/script/users/X-Treme_XPSScan.py index f8854f75..07162464 100644 --- a/script/users/X-Treme_XPSScan.py +++ b/script/users/X-Treme_XPSScan.py @@ -86,16 +86,16 @@ REG2 = {'name': '810eV_Ag3d', 'elo': 427.0, 'ehi': 441.0, 'estep': 0.05, 'epass' REGIONS = [REG1] """ -""" + # front end 3x4 mm2 # Ephot = 810 eV; if 'ephot' is not specified in the region, it will not be set!! REG1 = {'name': '810eV_survey', 'elo': 60.0, 'ehi': 810.0, 'estep': 0.5, 'epass': 50., 'tstep': 0.25, 'iter': 1, 'slit' : 30, 'cis': True} REG2 = {'name': '810eV_Ag3d', 'elo': 427.0, 'ehi': 441.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'slit' : 30, 'cis': True} REG3 = {'name': '810eV_O1s', 'elo': 270.0, 'ehi': 280.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} -#REG4 = {'name': '810eV_N1s', 'elo': 400.0, 'ehi': 416.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 3, 'slit' : 30, 'cis': True} +REG4 = {'name': '810eV_N1s', 'elo': 400.0, 'ehi': 416.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} REG4b = {'name': '810eV_N1s', 'elo': 400.0, 'ehi': 416.0, 'estep': 0.05, 'epass': 50., 'tstep': 1, 'iter': 3, 'slit' : 30, 'cis': True} -REG5 = {'name': '810eV_C1s', 'elo': 512.0, 'ehi': 528.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 3, 'slit' : 30, 'cis': True} +REG5 = {'name': '810eV_C1s', 'elo': 512.0, 'ehi': 528.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} ###REGVB_NaClcoarse = {'name': '810eV_VBcoarse', 'elo': 793.0, 'ehi': 807.0, 'estep': 0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 100, 'cis': True} ###REGVB_NaClfine = {'name': '810eV_VBfine', 'elo': 802.0, 'ehi': 807.0, 'estep': 0.01, 'epass': 50., 'tstep': 0.5, 'iter': 2, 'slit' : 100, 'cis': True} @@ -110,14 +110,14 @@ REGchlorine2p = {'name': '810eV_chlorine2p', 'elo': 600.0, 'ehi': 609.0, 'estep' #REGIONS = [REG4b, REG5, REGVB_NaClcoarse, REGVB_NaClfine] #with MgO -#REGIONS = [REG1, REG2, REG3, REG4b, REG5, REG7] +REGIONS = [REG1, REG2, REG3, REG4, REG5, REG7] ##REGIONS = [REGVB_NaClfine] + + + + """ - - - - # Ephot = 1600 eV; if 'ephot' is not specified in the region, it will not be set!! # front end 3x4 mm2 REGsurvey = {'name': '1600eV_survey', 'elo': 100.0, 'ehi': 1600.0, 'estep': 0.5, 'epass': 100., 'tstep': 0.25, 'iter': 1, 'slit' : 50, 'cis': True} @@ -127,7 +127,7 @@ REGNa = {'name': '1600eV_Na1s' , 'elo': 517.0, 'ehi': 531.0, 'estep': 0.02, 'ep REGIONS = [REGsurvey, REGMg, REGAg] #REGIONS = [REGsurvey, REGNa, REGAg] # for NaCl/Ag - +""" # list of region dictionaries to execute at each scan position