From 3edc0342798cb7b661db026abc5af16bbf93436b Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 25 Oct 2018 10:30:27 +0200 Subject: [PATCH] Script execution --- script/MultiRegionHoloScan.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/script/MultiRegionHoloScan.py b/script/MultiRegionHoloScan.py index 9ae9171d..bcb4eb37 100644 --- a/script/MultiRegionHoloScan.py +++ b/script/MultiRegionHoloScan.py @@ -5,14 +5,16 @@ Arguments: LATENCY = 0.0 -PHI_RANGE = (-160, 160.0) # (tuple (min, max)) -THETA_RANGE = (-10, 75) # (tuple (min, max)) +PHI_RANGE = (0, 160.0) # (tuple (min, max)) +THETA_RANGE = (-9, 81) # (tuple (min, max)) STEPS = (40.0, 1.0) # (tuple (phi, theta)) ZIGZAG = True -REGION1 = {'name': 'N1s', 'elo': 95.8, 'ehi': 98.8, 'estep': 0.05, 'epass': 50, 'tstep': 0.6, 'iter': 1, 'cis': True, 'slit': 200} -REGION2 = {'name': 'C1s', 'elo': 208.0, 'ehi': 213.0, 'estep': 0.05, 'epass': 50, 'tstep': 0.5, 'iter': 1, 'cis': True, 'slit': 200} -REGIONS = [REGION1, REGION2] +REGION1 = {'name': 'Pt4f', 'elo': 1016, 'ehi': 1028, 'estep': 0.2, 'epass': 100, 'tstep': 0.05, 'iter': 1, 'cis': True, 'slit': 40} +REGION2 = {'name': 'B1s', 'elo': 901, 'ehi': 909, 'estep': 0.2, 'epass': 100, 'tstep': 0.3, 'iter': 1, 'cis': True, 'slit': 210} +REGION3 = {'name': 'C1s', 'elo': 808, 'ehi': 813, 'estep': 0.2, 'epass': 100, 'tstep': 0.3, 'iter': 1, 'cis': True, 'slit': 210} +REGION4 = {'name': 'N1s', 'elo': 694, 'ehi': 701, 'estep': 0.2, 'epass': 100, 'tstep': 0.3, 'iter': 1, 'cis': True, 'slit': 210} +REGIONS = [REGION1, REGION2, REGION3, REGION4] CLOSE_SHUTTER_AT_END = True