From 8c0aff97b31c791b2c018fcfba658b080b59ceb1 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Tue, 5 Mar 2019 03:38:59 +0100 Subject: [PATCH] Script execution --- script/users/X-Treme_XPSScan.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/users/X-Treme_XPSScan.py b/script/users/X-Treme_XPSScan.py index 989a884e..22ab6b12 100644 --- a/script/users/X-Treme_XPSScan.py +++ b/script/users/X-Treme_XPSScan.py @@ -84,7 +84,7 @@ REG2 = {'name': '800eV_Ag3d', 'elo': 417.0, 'ehi': 431.0, 'estep': 0.05, 'epass' REGIONS = [REG1, REG2] """ -""" + # 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': 1.0, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} @@ -92,22 +92,22 @@ REG2 = {'name': '810eV_Ag3d', 'elo': 427.0, 'ehi': 441.0, 'estep': 0.05, 'epass' REG3 = {'name': '810eV_O1s', 'elo': 270.0, 'ehi': 280.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} #REG4 = {'name': '810eV_N1s', 'elo': 400.0, 'ehi': 416.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 3, 'slit' : 30, 'cis': True} -REG4b = {'name': '810eV_N1s', 'elo': 400.0, 'ehi': 416.0, 'estep': 0.05, 'epass': 50., 'tstep': 1, 'iter': 1, 'slit' : 30, 'cis': True} -REG5 = {'name': '810eV_C1s', 'elo': 512.0, 'ehi': 528.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 30, 'cis': True} +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} # do not use REG6 = {'name': '810eV_VBcoarse', 'elo': 793.0, 'ehi': 807.0, 'estep': 0.02, 'epass': 50., 'tstep': 0.5, 'iter': 1, 'slit' : 50, '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} 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] - +""" # list of region dictionaries to execute at each scan position