From b481e6c1c8606a212b699a536af2d863c7458360 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Wed, 7 Mar 2018 11:33:32 +0100 Subject: [PATCH] Script execution --- script/MultiRegionHoloScan.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/script/MultiRegionHoloScan.py b/script/MultiRegionHoloScan.py index 30aae04f..bf819aec 100644 --- a/script/MultiRegionHoloScan.py +++ b/script/MultiRegionHoloScan.py @@ -5,14 +5,16 @@ Arguments: LATENCY = 0.0 -PHI_RANGE = (-72.0, 72.0) # (tuple (min, max)) +PHI_RANGE = (-160.0, 160.0) # (tuple (min, max)) THETA_RANGE = (-9.0, 81.0) # (tuple (min, max)) -STEPS = (36.0, 1.0) # (tuple (phi, theta)) +STEPS = (40.0, 1.0) # (tuple (phi, theta)) ZIGZAG = True -REGION1 = {'name': 'Cu Auger', 'elo': 910.55, 'ehi': 917.0, 'estep': 0.075, 'epass': 100, 'tstep': 0.4, 'iter': 1, 'cis': True} -REGION2 = {'name': 'C 1s', 'elo': 997.0, 'ehi': 1003.0, 'estep': 0.05, 'epass': 100, 'tstep': 0.4, 'iter': 1, 'cis': True} -REGIONS = [REGION1, REGION2] +REGION1 = {'name': 'Pt 4f', 'elo': 516.0, 'ehi': 528.0, 'estep': 0.2, 'epass': 100, 'tstep': 0.05, 'iter': 1, 'cis': True, 'slit': 50} +REGION2 = {'name': 'B 1s', 'elo': 401.0, 'ehi': 408.0, 'estep': 0.2, 'epass': 100, 'tstep': 0.3, 'iter': 1, 'cis': True, 'slit': 200} +REGION3 = {'name': 'C 1s', 'elo': 308.0, 'ehi': 313.0, 'estep': 0.2, 'epass': 100, 'tstep': 0.3, 'iter': 1, 'cis': True, 'slit': 130} +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] CLOSE_SHUTTER_AT_END = True @@ -32,6 +34,7 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): self.step_energy_dataset_name = path + "ScientaStepEnergy" self.step_time_dataset_name = path + "ScientaStepTime" self.iterations_dataset_name = path + "ScientaIterations" + self.slit_dataset_name = path + "ExitSlit" create_dataset(self.channel_begin_dataset_name, 'd') create_dataset(self.channel_end_dataset_name, 'd') @@ -39,6 +42,7 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): create_dataset(self.step_energy_dataset_name, 'd') create_dataset(self.step_time_dataset_name, 'd') create_dataset(self.iterations_dataset_name, 'd') + create_dataset(self.slit_dataset_name, 'd') def setup(self): if self.scan_index != get_exec_pars().index: @@ -56,6 +60,7 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): Scienta.setPassEnergy(self.region['epass']) Scienta.stepTime.write(self.region['tstep']) Scienta.setIterations(self.region['iter']) + ExitSlit.write(self.region['slit']) Scienta.update() append_dataset(self.channel_begin_dataset_name, elo) @@ -64,6 +69,7 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): append_dataset(self.step_energy_dataset_name, self.region['estep']) append_dataset(self.step_time_dataset_name, self.region['tstep']) append_dataset(self.iterations_dataset_name, self.region['iter']) + append_dataset(self.slit_dataset_name, self.region['slit']) def read(self): global current_region_index