From caafcd626f74670293da2bda7dddd27b4b62903f Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Sun, 3 Mar 2019 12:35:46 +0100 Subject: [PATCH] Script execution --- script/users/X-Treme_XPSScan.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/script/users/X-Treme_XPSScan.py b/script/users/X-Treme_XPSScan.py index cf7fa50e..63929a3f 100644 --- a/script/users/X-Treme_XPSScan.py +++ b/script/users/X-Treme_XPSScan.py @@ -68,11 +68,20 @@ REG2 = {'name': '510eV_Ag3d', 'elo': 127.0, 'ehi': 141.0, 'estep': 0.05, 'epass' REGIONS = [REG1, REG2] """ +""" # front end 3x4 mm2 # Ephot = 490 eV; if 'ephot' is not specified in the region, it will not be set!! REG1 = {'name': '490eV_Dy4d', 'elo': 320.0, 'ehi': 340.0, 'estep': 0.05, 'epass': 20., 'tstep': 0.5, 'iter': 3, 'slit' : 100, 'cis': True} #REG2 = {'name': '490eV_Ag3d', 'elo': 107.0, 'ehi': 121.0, 'estep': 0.05, 'epass': 20., 'tstep': 0.5, 'iter': 1, 'slit' : 100, 'cis': True} 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': 1.0, '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] """ @@ -306,12 +315,13 @@ def do_scan(motors, positions, regions, latency): try: - """ ################## THIS IS TO OPEN THE VALVES /SHUTTER + ################## THIS IS TO OPEN THE VALVES /SHUTTER if caget('X03DA-OP-VG7:OPEN') == 'Not_Open': caput('X03DA-OP-VG7:WT_SET',0) #open ES vacuum valve time.sleep(0.2) caput('X03DA-OP-VG7:WT_SET',1) #open ES vacuum valve - + + """ caput('X03DA-OP-ST1:WT_SET_CLOSE',0) # caput('X03DA-OP-ST1:WT_SET_OPEN',1) # open ES Shutter