From 95c32a97faa4ef7c68cb39839f7771c690670bc4 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 6 Sep 2018 00:33:50 +0200 Subject: [PATCH] Script execution --- script/MultiRegionHoloScan.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/script/MultiRegionHoloScan.py b/script/MultiRegionHoloScan.py index e32d8c60..d8a01ab1 100644 --- a/script/MultiRegionHoloScan.py +++ b/script/MultiRegionHoloScan.py @@ -5,18 +5,21 @@ Arguments: LATENCY = 0.0 -PHI_RANGE = (-160.0, 160.0) # (tuple (min, max)) -THETA_RANGE = (-9.0, 81.0) # (tuple (min, max)) +PHI_RANGE = (-160, 160.0) # (tuple (min, max)) +THETA_RANGE = (-10, 75) # (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} +REGION1 = {'name': 'N1s', 'ece': 196.5,'epass': 100, 'tstep': 20, 'iter': 1, 'cis': True, 'slit': 100} +REGION2 = {'name': 'C1s', 'ece': 310.5,'epass': 100, 'tstep': 20, 'iter': 1, 'cis': True, 'slit': 100} +#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] CLOSE_SHUTTER_AT_END = True -Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept) +#Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept) +Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Fixed) class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): def initialize(self):