diff --git a/script/users/X-Treme_XPSScan.py b/script/users/X-Treme_XPSScan.py index e14a9a3e..f427b2c5 100644 --- a/script/users/X-Treme_XPSScan.py +++ b/script/users/X-Treme_XPSScan.py @@ -78,15 +78,15 @@ REG1 = {'name': '490eV_Dy4d', 'elo': 320.0, 'ehi': 340.0, 'estep': 0.05, 'epass' REGIONS = [REG1] """ -""" + # front end 3x4 mm2 -# Ephot = 800 eV; if 'ephot' is not specified in the region, it will not be set!! -REG1 = {'name': '800eV_Dy4d', 'elo': 634.0, 'ehi': 646.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 3, 'slit' : 100, 'cis': True} -REG2 = {'name': '800eV_Ag3d', 'elo': 417.0, 'ehi': 431.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} -REGIONS = [REG1, REG2] +# Ephot = 810 eV; if 'ephot' is not specified in the region, it will not be set!! +REG1 = {'name': '810eV_Tb4d', 'elo': 644.0, 'ehi': 657.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 5, 'slit' : 100, 'cis': True} +REG2 = {'name': '810eV_Ag3d', 'elo': 427.0, 'ehi': 441.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} +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} @@ -97,8 +97,8 @@ REG3 = {'name': '810eV_O1s', 'elo': 270.0, 'ehi': 280.0, 'estep': 0.05, 'epass': 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} -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} +###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} REG7 = {'name': '810eV_VBzoom', 'elo': 804.0, 'ehi': 806.0, 'estep': 0.005, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 50, 'cis': True} @@ -107,12 +107,14 @@ REGchlorine2p = {'name': '810eV_chlorine2p', 'elo': 600.0, 'ehi': 609.0, 'estep' #with NaCl #REGIONS = [REG1, REG2, REG3, REG4b, REG5, REGchlorine2s, REGchlorine2p] -REGIONS = [REG4b, REG5, REGVB_NaClcoarse, REGVB_NaClfine] +#REGIONS = [REG4b, REG5, REGVB_NaClcoarse, REGVB_NaClfine] #with MgO #REGIONS = [REG1, REG2, REG3, REG4b, REG5, REG7] ##REGIONS = [REGVB_NaClfine] +""" + """