diff --git a/script/users/X-Treme_XPSScan.py b/script/users/X-Treme_XPSScan.py index ebb6bfa8..8e639335 100644 --- a/script/users/X-Treme_XPSScan.py +++ b/script/users/X-Treme_XPSScan.py @@ -76,13 +76,13 @@ 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] - +""" """ # front end 3x4 mm2 @@ -97,14 +97,14 @@ REG7 = {'name': '810eV_VBzoom', 'elo': 803.0, 'ehi': 807.0, 'estep': 0.005, 'epa REGIONS = [REG1, REG2, REG3, REG4, REG5, REG6, 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, '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} +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': 272.0, 'ehi': 312.0, 'estep': 0.02, 'epass': 100., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} +REG3 = {'name': '1600eV_Ag3d1' , 'elo': 1217.0, 'ehi': 1231.0, 'estep': 0.02, 'epass': 100., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} REGIONS = [REG1, REG2, REG3] -""" + # # list of region dictionaries to execute at each scan position