diff --git a/script/users/X-Treme_XPSScan.py b/script/users/X-Treme_XPSScan.py index 091d8e96..1dbe81f5 100644 --- a/script/users/X-Treme_XPSScan.py +++ b/script/users/X-Treme_XPSScan.py @@ -44,7 +44,7 @@ LATENCY = 0.0 ######### X-TREME samples ############## - +""" # front end 4x6 mm2 # Ephot = 62 eV; if 'ephot' is not specified in the region, it will not be set!! REG1 = {'name': '62eV_VBcoarse', 'elo': 49.0, 'ehi': 58.0, 'estep': 0.002, 'epass': 10., 'tstep': 0.5, 'iter': 1, 'slit' : 100, 'cis': True} @@ -52,7 +52,7 @@ REG1 = {'name': '62eV_VBcoarse', 'elo': 49.0, 'ehi': 58.0, 'estep': 0.002, 'epas REGIONS = [REG1] #REGIONS = [REG1, REG2] - +""" """ DO NOT DO 80 eV ANY MORE # front end 3x4 mm2 @@ -102,14 +102,17 @@ REG7 = {'name': '810eV_VBzoom', 'elo': 804.0, 'ehi': 806.0, 'estep': 0.005, 'epa REGIONS = [REG1, REG2, REG3, REG4b, REG5, REG7] """ -""" + # Ephot = 1600 eV; if 'ephot' is not specified in the region, it will not be set!! # front end 3x4 mm2 -REG1 = {'name': '1600eV_survey', 'elo': 100.0, 'ehi': 1600.0, 'estep': 1.0, 'epass': 100., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} -REG2 = {'name': '1600eV_Mg1s' , 'elo': 286.0, 'ehi': 300.0, 'estep': 0.02, 'epass': 100., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} -REG3 = {'name': '1600eV_Ag3d1' , 'elo': 1219.0, 'ehi': 1231.0, 'estep': 0.02, 'epass': 100., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} -REGIONS = [REG1, REG2, REG3] -""" +REGsurvey = {'name': '1600eV_survey', 'elo': 100.0, 'ehi': 1600.0, 'estep': 0.5, 'epass': 100., 'tstep': 0.25, 'iter': 1, 'slit' : 50, 'cis': True} +REGMg = {'name': '1600eV_Mg1s' , 'elo': 286.0, 'ehi': 300.0, 'estep': 0.02, 'epass': 100., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} +REGAg = {'name': '1600eV_Ag3d1' , 'elo': 1219.0, 'ehi': 1231.0, 'estep': 0.02, 'epass': 100., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} +REGNa = {'name': '1600eV_Na1s' , 'elo': 517.0, 'ehi': 531.0, 'estep': 0.02, 'epass': 100., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} + +#REGIONS = [REGsurvey, REGMg, REGAg] +REGIONS = [REGsurvey, REGNa, REGAg] # for NaCl/Ag + # list of region dictionaries to execute at each scan position