From 73f600b8dacef345525630c937214d7b93725a07 Mon Sep 17 00:00:00 2001 From: x03daop Date: Tue, 6 Jun 2017 10:19:43 +0200 Subject: [PATCH] Script execution --- script/MultiRegionScan.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index 346a146a..e6a5c679 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -4,7 +4,7 @@ Arguments: """ MOTORS = [Eph] -POSITIONS = [400.0, 401.0] +POSITIONS = [600.0, 610.0] LATENCY = 0.0 REGION1 = {'name': 'Peak 1', 'elo': 243.0, 'ehi': 253.0, 'estep': 0.1, 'epass': 50, 'tstep': 0.1, 'iter': 1, 'cis': True} @@ -22,13 +22,13 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): def create_datasets(self): path = get_exec_pars().scanPath - - 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) + + self.channel_begin_dataset_name = path + "region {0}/ScientaChannelBegin".format(self.region_index + 1) + self.channel_end_dataset_name = path + "region {0}/ScientaChannelEnd".format(self.region_index + 1) + self.pass_energy_dataset_name = path + "region {0}/ScientaPassEnergy".format(self.region_index + 1) + self.step_energy_dataset_name = path + "region {0}/ScientaStepEnergy".format(self.region_index + 1) + self.step_time_dataset_name = path + "region {0}/ScientaStepTime".format(self.region_index + 1) + self.iterations_dataset_name = path + "region {0}/ScientaIterations".format(self.region_index + 1) create_dataset(self.channel_begin_dataset_name, 'd') create_dataset(self.channel_end_dataset_name, 'd') @@ -147,7 +147,8 @@ def do_scan(motors, positions, regions, latency): adjust_sensors() set_adc_averaging() - vscan(motors, SENSORS, positions, True, latency,False, before_read=wait_beam, after_read = after_readout) + #vscan(motors, SENSORS, positions, True, latency,False, before_read=wait_beam, after_read = after_readout) + vscan(motors, SENSORS, positions, True, latency,False, after_read = after_readout) for (index, region) in enumerate(regions): set_attribute(get_exec_pars().scanPath + "ScientaSpectrum{0}".format(index + 1), "RegionName", region['name'])