From 80c8ca73e4fa10fb49f798a6091888f632f68827 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 9 May 2019 22:31:03 +0200 Subject: [PATCH] Script execution --- script/users/Oteyza/TemperatureRamp.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/script/users/Oteyza/TemperatureRamp.py b/script/users/Oteyza/TemperatureRamp.py index 61a0fdfb..5e7f4c0e 100644 --- a/script/users/Oteyza/TemperatureRamp.py +++ b/script/users/Oteyza/TemperatureRamp.py @@ -2,18 +2,13 @@ Discrete scan (vector scan) of multiple spectral regions """ -PHI_RANGE = (-160.0, 160.0) # (tuple (min, max)) -THETA_RANGE = (-9.0, 81.0) # (tuple (min, max)) -STEPS = (40.0, 1.0) # (tuple (phi, theta)) -ZIGZAG = True - # scan positioner: Eph = photon energy #MOTORS = (ManipulatorPhi, ManipulatorTheta) #MOTORS = [ManipulatorPhi] MOTORS = ["ca://X03DA-PSU-XP:SETCUR"] +#MOTORS = [dummy] # comma-separated discrete list of scan positions -#POSITIONS = [(PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS] -POSITIONS = [0.03, 0.05, 0.01] +POSITIONS = [0.03, 1.01, 0.01] #POSITIONS = [0.] # seconds to wait between positioning command and triggering the detector LATENCY = 5.0 @@ -36,17 +31,19 @@ LATENCY = 5.0 # 'cis': True = constant initial state (photoemission line), False = constant final state (Auger peak), (default False) # 'slit': exit slit (default current value) -REGION1 = {'name': 'C 1s', 'ephot': 420.0, 'elo': 127.0, 'ehi': 136.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False} -REGION2 = {'name': 'Br 3d', 'ephot': 420.0, 'elo': 220.0, 'ehi': 242.0, 'estep': 0.10, 'epass': 50., 'tstep': 0.3, 'iter': 1, 'cis': False} +REGION1 = {'name': 'C 1s', 'ephot': 420.0, 'elo': 128.0, 'ehi': 135.0, 'estep': 0.05, 'epass': 50, 'tstep': 0.4, 'iter': 1, 'cis': False} +#REGION2 = {'name': 'Br 3p', 'ephot': 420.0, 'elo': 220.0, 'ehi': 242.0, 'estep': 0.10, 'epass': 50, 'tstep': 0.3, 'iter': 1, 'cis': False} +REGION2 = {'name': 'Br 3d', 'ephot': 420.0, 'elo': 342.0, 'ehi': 350.0, 'estep': 0.05, 'epass': 50, 'tstep': 0.7, 'iter': 1, 'cis': False} + #REGION1 = {'name': 'C 1s', 'ephot': 420.0, 'efix': 160.0, 'epass': 100., 'tstep': 20., 'iter': 1, 'cis': False} -#REGION2 = {'name': 'Br 3d', 'ephot': 420.0, 'efix': 230.0, 'epass': 100., 'tstep': 20., 'iter': 1, 'cis': False} +#REGION2 = {'name': 'Br 3p', 'ephot': 420.0, 'efix': 230.0, 'epass': 100., 'tstep': 20., 'iter': 1, 'cis': False} #REGION1 = {'name': 'secondary', 'elo': 9.0, 'ehi': 11.0, 'estep': 0.02, 'epass': 2, 'tstep': 0.20, 'iter': 1, 'cis': False} #REGION2 = {'name': 'fermi', 'elo': 23.5, 'ehi': 27.5, 'estep': 0.02, 'epass': 2, 'tstep': 0.35, 'iter': 1, 'cis': False} # list of region dictionaries to execute at each scan position -REGIONS = [REGION1, REGION2] +REGIONS = [REGION1, REGION2 ] # close beam shutter and turn off analyser at the end of the scan CLOSE_SHUTTER_AT_END = True