diff --git a/script/SchofieldScan.py b/script/SchofieldScan.py index dc8374d6..d9f6b345 100644 --- a/script/SchofieldScan.py +++ b/script/SchofieldScan.py @@ -9,6 +9,7 @@ TYPE ('CIS' or 'CFS') STEP (double) """ VECTOR = [ 630.0, 634.0] +LATENCY = 0.0 class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): @@ -17,6 +18,7 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): self.offset = Eph.getSetpoint().take() - VECTOR[0] self.setup() trig_scienta() + time.sleep(0.5) return Scienta.getSpectrum().read() def getSize(self): @@ -38,7 +40,7 @@ class SpectrumReader2(SpectrumReader): Scienta.getLowEnergy().write(94.0 + self.offset) Scienta.getHighEnergy().write(98.0 + self.offset) global energy_scale_array - energy_scale_array.append([Scienta.getLowEnergy().take(), Scienta.getHighEnergy().take(), Scienta.getStepSize().take()]) + energy_scale_array = energy_scale_array + [Scienta.getLowEnergy().take(), Scienta.getHighEnergy().take(), Scienta.getStepSize().take()] class SpectrumReader3(SpectrumReader): def setup(self): @@ -46,7 +48,7 @@ class SpectrumReader3(SpectrumReader): Scienta.getLowEnergy().write(98.0 + self.offset) Scienta.getHighEnergy().write(108.0 + self.offset) global energy_scale_array, energy_scale_table - energy_scale_array.append([Scienta.getLowEnergy().take(), Scienta.getHighEnergy().take(), Scienta.getStepSize().take()]) + energy_scale_array = energy_scale_array + [Scienta.getLowEnergy().take(), Scienta.getHighEnergy().take(), Scienta.getStepSize().take()] append_dataset(energy_scale_table,energy_scale_array)