diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index 89e2e1c3..fb5c4030 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -155,41 +155,38 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): if self.region['fixed']: Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Fixed) Scienta.centerEnergy.write(elo) + append_dataset(self.channel_center_dataset_name, elo) else: Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept) Scienta.lowEnergy.write(elo) Scienta.highEnergy.write(ehi) Scienta.stepSize.write(self.region['estep']) + append_dataset(self.channel_begin_dataset_name, elo) + append_dataset(self.channel_end_dataset_name, ehi) + append_dataset(self.step_energy_dataset_name, self.region['estep']) try: Scienta.setPassEnergy(int(self.region['epass'])) + append_dataset(self.pass_energy_dataset_name, self.region['epass']) except KeyError: pass try: Scienta.stepTime.write(self.region['tstep']) + append_dataset(self.step_time_dataset_name, self.region['tstep']) except KeyError: pass try: Scienta.setIterations(self.region['iter']) + append_dataset(self.iterations_dataset_name, self.region['iter']) except KeyError: pass try: ExitSlit.move(self.region['slit']) + append_dataset(self.slit_dataset_name, self.region['slit']) except KeyError: pass Scienta.update() - if self.region['fixed']: - append_dataset(self.channel_center_dataset_name, elo) - else: - append_dataset(self.channel_begin_dataset_name, elo) - append_dataset(self.channel_end_dataset_name, ehi) - append_dataset(self.step_energy_dataset_name, self.region['estep']) - - append_dataset(self.pass_energy_dataset_name, self.region['epass']) - 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']) print("done spectrum.setup") def read(self):