From e327e767ebd7aa4e4f6c372f002fd09483aca5dc Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Mon, 12 Mar 2018 18:46:23 +0100 Subject: [PATCH] Script execution --- script/MultiRegionHoloScan.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/MultiRegionHoloScan.py b/script/MultiRegionHoloScan.py index cf7365da..21ac823a 100644 --- a/script/MultiRegionHoloScan.py +++ b/script/MultiRegionHoloScan.py @@ -5,16 +5,16 @@ Arguments: LATENCY = 0.0 -PHI_RANGE = (-160.0, 160.0) # (tuple (min, max)) +PHI_RANGE = (-160.0, 0.0) # (tuple (min, max)) THETA_RANGE = (-9.0, 81.0) # (tuple (min, max)) STEPS = (40.0, 1.0) # (tuple (phi, theta)) ZIGZAG = True -REGION1 = {'name': 'Pt 4f', 'elo': 616.0, 'ehi': 628.0, 'estep': 0.2, 'epass': 100, 'tstep': 0.05, 'iter': 1, 'cis': True, 'slit': 40} -REGION2 = {'name': 'B 1s', 'elo': 501.0, 'ehi': 508.0, 'estep': 0.2, 'epass': 100, 'tstep': 0.4, 'iter': 1, 'cis': True, 'slit': 210} -REGION3 = {'name': 'C 1s', 'elo': 408.0, 'ehi': 413.0, 'estep': 0.2, 'epass': 100, 'tstep': 0.35, 'iter': 1, 'cis': True, 'slit': 200} -REGION4 = {'name': 'N 1s', 'elo': 294.0, 'ehi': 301.0, 'estep': 0.2, 'epass': 100, 'tstep': 0.35, 'iter': 1, 'cis': True, 'slit': 190} -REGIONS = [REGION1, REGION2, REGION3, REGION4] +REGION1 = {'name': 'Pt 4f', 'elo': 516.0, 'ehi': 528.0, 'estep': 0.2, 'epass': 100, 'tstep': 0.05, 'iter': 1, 'cis': True, 'slit': 40} +REGION2 = {'name': 'B 1s', 'elo': 401.0, 'ehi': 408.0, 'estep': 0.2, 'epass': 100, 'tstep': 0.3, 'iter': 1, 'cis': True, 'slit': 220} +REGION2 = {'name': 'C 1s', 'elo': 308.0, 'ehi': 313.0, 'estep': 0.2, 'epass': 100, 'tstep': 0.3, 'iter': 1, 'cis': True, 'slit': 220} +REGION3 = {'name': 'N 1s', 'elo': 194.0, 'ehi': 201.0, 'estep': 0.2, 'epass': 100, 'tstep': 0.3, 'iter': 1, 'cis': True, 'slit': 200} +REGIONS = [REGION1, REGION2, REGION3] CLOSE_SHUTTER_AT_END = True