diff --git a/script/MultiRegionScan2.py b/script/MultiRegionScan2.py index 539b8e37..6dc8e351 100644 --- a/script/MultiRegionScan2.py +++ b/script/MultiRegionScan2.py @@ -3,7 +3,7 @@ Arguments: """ -MOTORS = [dummy] +MOTORS = [Eph] VECTOR = [295.0, 296.0] LATENCY = 0.0 @@ -13,16 +13,17 @@ REGIONS = [REGION1, REGION2] class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): def setup(self): - print "setup" + print "enter SpectrumReader.setup" Scienta.lowEnergy.write(region['elo']) Scienta.highEnergy.write(region['ehi']) Scienta.stepSize.write(region['estep']) Scienta.setPassEnergy(region['epass']) Scienta.stepTime.write(region['tstep']) Scienta.setIterations(region['iter']) + print "exit SpectrumReader.setup" def read(self): - print "SpectrumReader.doRead" + print "enter SpectrumReader.read" print str(self.region) self.setup() print "trig_scienta" @@ -38,7 +39,7 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): class ImageReader(ReadonlyRegisterBase, ReadonlyRegisterMatrix): def read(self): - print "ImageReader.doRead" + print "ImageReader.read" print str(self.region) return Scienta.getDataMatrix().read()