diff --git a/script/users/MultiRegionScan_Ag_valence62eV.py b/script/users/MultiRegionScan_Ag_valence62eV.py index aa39b126..e5bd1333 100644 --- a/script/users/MultiRegionScan_Ag_valence62eV.py +++ b/script/users/MultiRegionScan_Ag_valence62eV.py @@ -108,7 +108,6 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): if self.region_index == 0: print "scan {0}".format(self.scan_index) - print("ephot") #ephot = Eph.read() #try: # if self.region['cis']: @@ -122,22 +121,27 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): elo = self.region['elo'] + edelta ehi = self.region['ehi'] + edelta - if self.region['fixed']: + try: Eph.write(self.region['ephot']) + except KeyError: + pass + + if self.region['fixed']: Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Fixed) Scienta.centerEnergy.write(elo) else: - 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']) - - #Scienta.setPassEnergy(self.region['epass']) - #Scienta.stepTime.write(self.region['tstep']) - #Scienta.setIterations(self.region['iter']) - #ExitSlit.write(self.region['slit']) - #Scienta.update() + + print("set pass energy") + Scienta.setPassEnergy(self.region['epass']) + Scienta.stepTime.write(self.region['tstep']) + Scienta.setIterations(self.region['iter']) + ExitSlit.write(self.region['slit']) + Scienta.update() + print("after update") if self.region['fixed']: append_dataset(self.channel_center_dataset_name, elo)