diff --git a/script/users/Oteyza/TemperatureRamp.py b/script/users/Oteyza/TemperatureRamp.py index f86e6cc7..9a36c6e1 100644 --- a/script/users/Oteyza/TemperatureRamp.py +++ b/script/users/Oteyza/TemperatureRamp.py @@ -13,7 +13,7 @@ ZIGZAG = True MOTORS = ["ca://X03DA-PSU-XP:SETCUR"] # comma-separated discrete list of scan positions #POSITIONS = [(PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS] -POSITIONS = [0., 0.3, 0.1] +POSITIONS = [0., 1.204, 0.004] #POSITIONS = [0.] # seconds to wait between positioning command and triggering the detector LATENCY = 5.0 @@ -36,8 +36,12 @@ 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': 115.0, 'ehi': 145.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.25, 'iter': 1, 'cis': False} -REGION2 = {'name': 'Br 3d', 'ephot': 420.0, 'elo': 215.0, 'ehi': 245.0, 'estep': 0.05, 'epass': 50., 'tstep': 0.25, 'iter': 1, 'cis': False} +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, '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} + #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}