diff --git a/script/users/X-Treme_XPSScan.py b/script/users/X-Treme_XPSScan.py index 1b0b1f9b..8d6da3c6 100644 --- a/script/users/X-Treme_XPSScan.py +++ b/script/users/X-Treme_XPSScan.py @@ -58,7 +58,7 @@ REG2 = {'name': 'VB_80eV_zoom', 'elo': 72.0, 'ehi': 76.0, 'estep': 0.002, 'epass REGIONS = [REG1, REG2] """ -""" + # Ephot = 800 eV; if 'ephot' is not specified in the region, it will not be set!! REG1 = {'name': '800eV_survey', 'elo': 50.0, 'ehi': 800.0, 'estep': 1.0, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, '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} @@ -69,19 +69,15 @@ REG6 = {'name': '800eV_VBcoarse', 'elo': 783.0, 'ehi': 797.0, 'estep': 0.02, 'ep # here we need to decide if it should be 0.02 or 0.002 in REG7 REG7 = {'name': '800eV_VBzoom', 'elo': 793.0, 'ehi': 797.0, 'estep': 0.002, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} REGIONS = [REG1, REG2, REG3, REG4, REG5, REG6, REG7] -""" -''' + +""" # Ephot = 1600 eV; if 'ephot' is not specified in the region, it will not be set!! REG1 = {'name': '1600eV_survey', 'elo': 100.0, 'ehi': 1600.0, 'estep': 1.0, 'epass': 100., 'tstep': 0.5, 'iter': 1, 'cis': True} REG2 = {'name': '1600eV_Mg1s' , 'elo': 272.0, 'ehi': 312.0, 'estep': 0.02, 'epass': 100., 'tstep': 0.5, 'iter': 1, 'cis': True} REG3 = {'name': '1600eV_Ag3d1' , 'elo': 1217.0, 'ehi': 1231.0, 'estep': 0.02, 'epass': 100., 'tstep': 0.5, 'iter': 1, 'cis': True} REGIONS = [REG1, REG2, REG3] -''' -#REG2 = {'name': '1600eV_Mg1s' , 'elo': 300.0, 'ehi': 320.0, 'estep': 0.02, 'epass': 100., 'tstep': 0.5, 'iter': 1, 'cis': True} -REG3 = {'name': '1600eV_Ag3d1' , 'elo': 1235.0, 'ehi': 1255.0, 'estep': 0.02, 'epass': 100., 'tstep': 0.5, 'iter': 1, 'cis': True} -REGIONS = [REG3] - +""" # # list of region dictionaries to execute at each scan position