From 7374da681dda574704909567ca67e114808bbb1c Mon Sep 17 00:00:00 2001 From: x03daop Date: Wed, 12 Apr 2017 11:42:40 +0200 Subject: [PATCH] Script execution --- script/MultiRegionScan.py | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index 21f3e7cb..98c586bf 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -18,12 +18,19 @@ Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept) class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): def initialize(self): #super(SpectrumReader, self).initialize() - self.channel_begin_dataset_name = "scan{0}/ScientaChannelBegin{1}".format(self.scan_index + 1, self.region_index + 1) - self.channel_end_dataset_name = "scan{0}/ScientaChannelEnd{1}".format(self.scan_index + 1, self.region_index + 1) - self.pass_energy_dataset_name = "scan{0}/ScientaPassEnergy{1}".format(self.scan_index + 1, self.region_index + 1) - self.step_energy_dataset_name = "scan{0}/ScientaStepEnergy{1}".format(self.scan_index + 1, self.region_index + 1) - self.step_time_dataset_name = "scan{0}/ScientaStepTime{1}".format(self.scan_index + 1, self.region_index + 1) - self.iterations_dataset_name = "scan{0}/ScientaIterations{1}".format(self.scan_index + 1, self.region_index + 1) + self.first_run_init = False + + def create_datasets(self): + print self.scan_index + path = get_exec_pars().scanPath + index = get_exec_pars().index + + self.channel_begin_dataset_name = path + "ScientaChannelBegin{0}".format(self.region_index + 1) + self.channel_end_dataset_name = path + "ScientaChannelEnd{0}".format(self.region_index + 1) + self.pass_energy_dataset_name = path + "ScientaPassEnergy{0}".format(self.region_index + 1) + self.step_energy_dataset_name = path + "ScientaStepEnergy{0}".format(self.region_index + 1) + self.step_time_dataset_name = path + "ScientaStepTime{0}".format(self.region_index + 1) + self.iterations_dataset_name = path + "ScientaIterations{0}".format(self.region_index + 1) create_dataset(self.channel_begin_dataset_name, 'd') create_dataset(self.channel_end_dataset_name, 'd') @@ -33,12 +40,12 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): create_dataset(self.iterations_dataset_name, 'd') def setup(self): - print get_exec_pars().index - print get_exec_pars().group - print get_exec_pars().scanPath - print self.initialized - + if not self.first_run_init: + self.create_datasets() + self.first_run_init = True + ephot = Eph.read() + print self.ephot_start try: if self.region['cis']: edelta = ephot - self.ephot_start