diff --git a/script/users/X-Treme_XPSScan.py b/script/users/X-Treme_XPSScan.py index fa6598c6..91f05668 100644 --- a/script/users/X-Treme_XPSScan.py +++ b/script/users/X-Treme_XPSScan.py @@ -60,17 +60,15 @@ 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} +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} -#REG3 = {'name': '800eV_O1s', 'elo': 260.0, 'ehi': 270.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} -#REG4 = {'name': '800eV_N1s', 'elo': 390.0, 'ehi': 406.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} -#REG5 = {'name': '800eV_C1s', 'elo': 500.0, 'ehi': 516.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} -#REG6 = {'name': '800eV_VBcoarse', 'elo': 783.0, 'ehi': 797.0, 'estep': 0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} +REG3 = {'name': '800eV_O1s', 'elo': 260.0, 'ehi': 270.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} +REG4 = {'name': '800eV_N1s', 'elo': 390.0, 'ehi': 406.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 3, 'slit' : 30, 'cis': True} +REG5 = {'name': '800eV_C1s', 'elo': 500.0, 'ehi': 516.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 3, 'slit' : 30, 'cis': True} +REG6 = {'name': '800eV_VBcoarse', 'elo': 783.0, 'ehi': 797.0, 'estep': 0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} # 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 = [REG2] - -#REGIONS = [REG1, REG2, REG3, REG4, REG5, REG6, 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] """