From 802c57945041a3b83b72c01b326e27443d4a3bec Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Tue, 26 Feb 2019 20:40:51 +0100 Subject: [PATCH] Script execution --- script/MultiRegionScan.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index a207ca58..66dcc6d9 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -101,36 +101,37 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): if self.region_index == 0: print "scan {0}".format(self.scan_index) - ephot = Eph.read() - try: - if self.region['cis']: - edelta = ephot - self.ephot_start - else: - edelta = 0.0 - except AttributeError: - self.ephot_start = ephot - edelta = 0.0 + #ephot = Eph.read() + #try: + # if self.region['cis']: + # edelta = ephot - self.ephot_start + # else: + # edelta = 0.0 + #except AttributeError: + # self.ephot_start = ephot + edelta = 0.0 elo = self.region['elo'] + edelta ehi = self.region['ehi'] + edelta + print("Eph.move") if self.region['fixed']: - Eph.move(self.region['ephot']) + Eph.write(self.region['ephot']) Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Fixed) Scienta.centerEnergy.write(elo) else: - Eph.move(self.region['ephot']) + Eph.write(self.region['ephot']) Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept) Scienta.lowEnergy.write(elo) Scienta.highEnergy.write(ehi) Scienta.stepSize.write(self.region['estep']) + print("Eph.moved") Scienta.setPassEnergy(self.region['epass']) Scienta.stepTime.write(self.region['tstep']) Scienta.setIterations(self.region['iter']) ExitSlit.write(self.region['slit']) Scienta.update() - print("scienta updated") if self.region['fixed']: append_dataset(self.channel_center_dataset_name, elo)