diff --git a/script/users/MultiRegionScan_Ag_valence62eV.py b/script/users/MultiRegionScan_Ag_valence62eV.py index e9b736e0..c7601d83 100644 --- a/script/users/MultiRegionScan_Ag_valence62eV.py +++ b/script/users/MultiRegionScan_Ag_valence62eV.py @@ -41,7 +41,7 @@ LATENCY = 0.0 #REGION2 = {'name': 'off-resonance', 'ephot': 1235.0, 'efix': 1219.4, 'epass': 200., 'tstep': 20., 'iter': 1, 'cis': False} #REGION1 = {'name': 'VB62eV', 'ephot': 62, 'elo': 49.0, 'ehi': 58.0, 'estep': 0.002, 'epass': 10, 'tstep': 0.5, 'iter': 1, 'cis': False} #REGION1 = {'name': 'VB62eVzoom', 'elo': 54.0, 'ehi': 58.0, 'estep': 0.002, 'epass': 10.0, 'tstep': 0.5, 'iter': 1, 'cis': True} -REGION1 = {'name': 'VB80eV', 'ephot': 80., 'elo': 67.0, 'ehi': 68.0, 'estep': 0.2, 'epass': 10., 'tstep': 0.5, 'iter': 1, 'cis': True} +REGION1 = {'name': 'VB80eV', 'elo': 67.0, 'ehi': 68.0, 'estep': 0.2, 'epass': 10., 'tstep': 0.5, 'iter': 1, 'cis': True} #REGION2 = {'name': 'fermi', 'elo': 23.5, 'ehi': 27.5, 'estep': 0.02, 'epass': 2, 'tstep': 0.35, 'iter': 1, 'cis': False} @@ -101,7 +101,6 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): create_dataset(self.slit_dataset_name, 'd') def setup(self): - print("spectrum.setup") if self.scan_index != get_exec_pars().index: self.scan_index = get_exec_pars().index self.create_datasets() @@ -135,13 +134,11 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): Scienta.highEnergy.write(ehi) Scienta.stepSize.write(self.region['estep']) - print("set pass energy") Scienta.setPassEnergy(int(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) @@ -156,7 +153,6 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): append_dataset(self.slit_dataset_name, self.region['slit']) def read(self): - print("spectrum.read") global current_region_index current_region_index = self.region_index self.setup() @@ -176,7 +172,6 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): class ImageReader(ReadonlyRegisterBase, ReadonlyRegisterMatrix): def read(self): - print("image.read") return Scienta.getDataMatrix().read() def getWidth(self):