diff --git a/script/MultiRegionHoloScan.py b/script/MultiRegionHoloScan.py index 8ec1a382..99fdfe65 100644 --- a/script/MultiRegionHoloScan.py +++ b/script/MultiRegionHoloScan.py @@ -5,16 +5,14 @@ Arguments: LATENCY = 0.0 -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)) +PHI_RANGE = (-100.0, 100.0) # (tuple (min, max)) +THETA_RANGE = (-9.0, 71.0) # (tuple (min, max)) +STEPS = (20.0, 1.0) # (tuple (phi, theta)) ZIGZAG = True -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} -REGION3 = {'name': 'C 1s', 'elo': 308.0, 'ehi': 313.0, 'estep': 0.2, 'epass': 100, 'tstep': 0.3, 'iter': 1, 'cis': True, 'slit': 220} -REGION4 = {'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, REGION4] +REGION1 = {'name': 'N1s', 'elo': 93.0, 'ehi': 99.0, 'estep': 0.05, 'epass': 50, 'tstep': 0.5, 'iter': 1, 'cis': True, 'slit': 200} +REGION2 = {'name': 'C1s', 'elo': 205.0, 'ehi': 214.0, 'estep': 0.05, 'epass': 50, 'tstep': 0.5, 'iter': 1, 'cis': True, 'slit': 200} +REGIONS = [REGION1, REGION2] CLOSE_SHUTTER_AT_END = True