From 7486a4b60e5fe0707572719740c6af72b2333f75 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 6 Oct 2022 19:39:14 +0200 Subject: [PATCH] Script execution --- script/users/Niels/MultiRegionScan2022.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/script/users/Niels/MultiRegionScan2022.py b/script/users/Niels/MultiRegionScan2022.py index 23ee07da..da6fceb3 100644 --- a/script/users/Niels/MultiRegionScan2022.py +++ b/script/users/Niels/MultiRegionScan2022.py @@ -21,7 +21,7 @@ MOTORS = [dummy] # number of cycles (integer - not decimal point!) # (actual number of cycles is + 1) -NUMBER_OF_CYCLES = 100 +NUMBER_OF_CYCLES = 5 POSITIONS = [1., 10., NUMBER_OF_CYCLES] SCAN = 'lscan' @@ -49,12 +49,12 @@ LATENCY = 0.0 # 'position': 'reference' or 'sample' REFERENCE_POSITION = {'X': -0.65 ,'Y': 0., 'Z': 117.7, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} -SAMPLE_POSITION = {'X': -1.32 ,'Y': 0., 'Z': 114., 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} +SAMPLE_POSITION = {'X': -1.32 ,'Y': -1., 'Z': 114., 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.} REGION1 = {'name': 'Au4f', 'ephot': 578., 'elo': 482, 'ehi':491.5, 'estep': 0.02, 'epass': 50., 'tstep': 0.3, 'iter': 1, 'cis': False, 'position': 'reference'} -# REGION2 = {'name': 'In4d','ephot': 578., 'elo': 552.5, 'ehi':559., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} -REGION3 = {'name': 'As3d','ephot': 578., 'elo': 529., 'ehi':534.5, 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} -# REGION4 = {'name': 'In3d','ephot': 578., 'elo': 119., 'ehi':124., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION2 = {'name': 'In4d','ephot': 578., 'elo': 552.5, 'ehi':559., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION3 = {'name': 'As3d','ephot': 578., 'elo': 529., 'ehi':534.5, 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} +REGION4 = {'name': 'In3d','ephot': 578., 'elo': 119., 'ehi':124., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'} # REGION1 = {'name': 'Au4f', 'ephot': 1050., 'elo': 954., 'ehi':963.5, 'estep': 0.02, 'epass': 50., 'tstep': 0.6, 'iter': 1, 'cis': False, 'position': 'reference'} # REGION2 = {'name': 'In4d','ephot': 1050., 'elo': 1024.5, 'ehi':1031., 'estep':0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'sample'}