From d33836ff50257ec94449713c61589fc6a446f123 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 29 Sep 2022 11:03:24 +0200 Subject: [PATCH] Closedown --- config/variables.properties | 6 ++--- script/users/Niels/MultiRegionScan2022.py | 31 ++++++++++++++++------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/config/variables.properties b/config/variables.properties index 707ea69e..ccb07805 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Tue Sep 27 15:46:23 CEST 2022 +#Tue Sep 27 16:02:40 CEST 2022 LastRunDate=220927 -FileSequentialNumber=13973 -DaySequentialNumber=1 +FileSequentialNumber=13976 +DaySequentialNumber=4 diff --git a/script/users/Niels/MultiRegionScan2022.py b/script/users/Niels/MultiRegionScan2022.py index 52ed2d19..f3d1b1db 100644 --- a/script/users/Niels/MultiRegionScan2022.py +++ b/script/users/Niels/MultiRegionScan2022.py @@ -1,20 +1,33 @@ """ repeated xps scans with reference sample +usage +===== + +1. set the NUMBER_OF_ITERATIONS +2. set the REFERENCE_POSITION and SAMPLE_POSITION +3. set the REGION parameters + +troubleshooting +=============== + +if the script runs through very quickly without measuring anything: +check that all position values include a decimal point!!! + """ # dummy scan (time series) MOTORS = [dummy] -# line scan [start, stop, number of steps] - -POSITIONS = [1., 10., 3] +# number of cycles (integer - not decimal point!) +# (actual number of cycles is + 1) +NUMBER_OF_CYCLES = 3 +POSITIONS = [1., 10., NUMBER_OF_CYCLES] SCAN = 'lscan' # seconds to wait between positioning command and triggering the detector LATENCY = 0.0 - # region setup # # for each region, define a python dictionary with the following items. @@ -38,15 +51,16 @@ LATENCY = 0.0 REFERENCE_POSITION = {'X': -2.5 ,'Y': 0., 'Z': 118., 'Theta': -6.2, 'Tilt': -2.0, 'Phi': 0.} SAMPLE_POSITION = {'X': -2.5 ,'Y': 0.1, 'Z': 115., 'Theta': -6.2, 'Tilt': -2.0, 'Phi': 0.} -REGION1 = {'name': 'AuFermi', 'ephot': 281. , 'elo': 138.5, 'ehi':140, 'estep': 0.01, 'epass': 10., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} -REGION2 = {'name': 'VB','ephot': 280., 'elo': 138.4, 'ehi':139.8, 'estep':0.01, 'epass': 10., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION3 = {'name': 'As3d','ephot': 280., 'elo': 96., 'ehi':101.0, 'estep':0.05, 'epass': 10., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION4 = {'name': 'As3d*','ephot': 280., 'elo': 106., 'ehi':111.0, 'estep':0.05, 'epass': 10., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION1 = {'name': 'Au4f', 'ephot': 578., 'elo': 80.00, 'ehi':92.00, 'estep': 0.02, 'epass': 10., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION2 = {'name': 'In4d','ephot': 578., 'elo': 15.00, 'ehi':22.0, 'estep':0.02, 'epass': 10., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION3 = {'name': 'As3d','ephot': 578., 'elo': 39.00, 'ehi':45.00, 'estep':0.02, 'epass': 10., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION4 = {'name': 'In3d','ephot': 578., 'elo': 450., 'ehi':455.0, 'estep':0.02, 'epass': 10., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} # list of region dictionaries to execute at each scan position REGIONS = [REGION1, REGION2, REGION3, REGION4] # close beam shutter and turn off analyser at the end of the scan +# True or False CLOSE_SHUTTER_AT_END = False @@ -71,7 +85,6 @@ def check_region(region): print("region {0}: setting default cis = {1}".format(region['name'], region['cis'])) def move_to_position(pdict): - print("moving to position", pdict) ManipulatorX.move(pdict['X']) ManipulatorY.move(pdict['Y']) ManipulatorZ.move(pdict['Z'])