diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index 957c9e6d..8f25ea23 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -18,6 +18,10 @@ Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept) class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): def initialize(self): #super(SpectrumReader, self).initialize() + print get_exec_pars().index + print get_exec_pars().group + print get_exec_pars().scanPath + self.channel_begin_dataset_name = "scan{0}/ScientaChannelBegin{1}".format(self.scan_index + 1, self.region_index + 1) self.channel_end_dataset_name = "scan{0}/ScientaChannelEnd{1}".format(self.scan_index + 1, self.region_index + 1) self.pass_energy_dataset_name = "scan{0}/ScientaPassEnergy{1}".format(self.scan_index + 1, self.region_index + 1) @@ -53,11 +57,6 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): Scienta.setIterations(self.region['iter']) Scienta.update() - print Scienta.getAcquirePeriod() - print Scienta.getAcquisitionTime().getValue() - print Scienta.getExposure() - print Scienta.getStepTime().getValue() - append_dataset(self.channel_begin_dataset_name, elo) append_dataset(self.channel_end_dataset_name, ehi) append_dataset(self.pass_energy_dataset_name, self.region['epass']) @@ -143,7 +142,7 @@ def do_scan(motors, positions, regions, latency): try: - set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1}) + set_preference(Preference.PLOT_TYPES, {'ScientaSpectrum1':1}) #task = fork(plot_cur_spectrum) do_scan(MOTORS, POSITIONS, REGIONS, LATENCY) finally: