diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index dc5565e9..4eecbd4a 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -98,7 +98,7 @@ def check_region(region): region['cis'] = False print("region {0}: setting default cis = {1}".format(region['name'], region['cis'])) if 'slit' not in region: - region['slit'] = ExitSlit.read() + region['slit'] = ExitSlit.take(100) print("region {0}: setting default slit = {1}".format(region['name'], region['slit'])) class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): @@ -142,8 +142,6 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): except KeyError: ephot = Eph.take(100) - print("done set ephot") - if isinstance(ephot, float) and ephot > 0.: try: if self.region['cis']: @@ -151,7 +149,6 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): except AttributeError: self.ephot_start = ephot - print("done read ephot") elo = self.region['elo'] + edelta ehi = self.region['ehi'] + edelta @@ -167,25 +164,25 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): 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']) - print("done ekin") + try: Scienta.setPassEnergy(int(self.region['epass'])) append_dataset(self.pass_energy_dataset_name, self.region['epass']) except KeyError: pass - print("done epass") + try: Scienta.stepTime.write(self.region['tstep']) append_dataset(self.step_time_dataset_name, self.region['tstep']) except KeyError: pass - print("done tstep") + try: Scienta.setIterations(self.region['iter']) append_dataset(self.iterations_dataset_name, self.region['iter']) except KeyError: pass - print("done iter") + try: ExitSlit.move(self.region['slit']) append_dataset(self.slit_dataset_name, self.region['slit'])