From f6bd17507dafac2c9c37d17005108500f8df407d Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Sun, 6 Nov 2022 10:45:04 +0100 Subject: [PATCH] Script execution --- script/users/Niels/MultiRegionScan2022_v2.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/script/users/Niels/MultiRegionScan2022_v2.py b/script/users/Niels/MultiRegionScan2022_v2.py index f6b1ebb7..ca112cec 100644 --- a/script/users/Niels/MultiRegionScan2022_v2.py +++ b/script/users/Niels/MultiRegionScan2022_v2.py @@ -21,7 +21,7 @@ MOTORS = [dummy] # number of cycles (integer - not decimal point!) # (actual number of cycles is + 1) -NUMBER_OF_CYCLES = 60 +NUMBER_OF_CYCLES = 10 POSITIONS = [1., 10., NUMBER_OF_CYCLES] SCAN = 'lscan' @@ -58,14 +58,19 @@ SAMPLE_POSITION = {'X': -1.2,'Y': 0., 'Z': 113.7, 'Theta': -9., 'Tilt': -2.0, 'P #REGION4 = {'name': 'In3d','elo': 119., 'ehi':124., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} # REGIONS for 1050 eV -REGION1 = {'name': 'Au4f', 'elo': 954., 'ehi':964, 'estep': 0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'reference'} +REGION1 = {'name': 'Au4f', 'elo': 954., 'ehi':964, 'estep': 0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'reference'} REGION2 = {'name': 'In4d', 'elo': 1024.5, 'ehi':1031.5, 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} REGION3 = {'name': 'As3d', 'elo': 1001.5, 'ehi':1007., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} REGION4 = {'name': 'In3d', 'elo': 591., 'ehi':596., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION5 = {'name': 'AuEF', 'elo': 1045., 'ehi':1046.5, 'estep':0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} # list of region dictionaries to execute at each scan position -REGIONS = [REGION1, REGION2, REGION3, REGION4] + +#REGIONS = [REGION1, REGION2, REGION3, REGION4] + +#self-designed regions +REGIONS = [REGION1,REGION5] # close beam shutter and turn off analyser at the end of the scan # True or False