diff --git a/script/users/TUM_PhD.py b/script/users/TUM_PhD.py index cc5cc1b2..64ce20e4 100644 --- a/script/users/TUM_PhD.py +++ b/script/users/TUM_PhD.py @@ -46,7 +46,7 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): create_dataset(self.step_time_dataset_name, 'd') create_dataset(self.iterations_dataset_name, 'd') - def setup(self,sample_pos=[]): + def setup(self): if self.scan_index != get_exec_pars().index: self.scan_index = get_exec_pars().index self.create_datasets() @@ -137,7 +137,8 @@ def do_scan(motors, positions, regions, latency, sample_position): SENSORS = [] for (index, region) in enumerate(regions): - reader = SpectrumReader(sample_pos=sample_position) + reader = SpectrumReader() + reader.sample_pos = sample_position reader.region_index = index reader.region_name = "region{0}".format(index + 1) reader.region = region @@ -179,7 +180,7 @@ try: ManipulatorY.move(nn[3]) ManipulatorZ.move(nn[4]) ManipulatorTheta.move(polar) - ManipulatorPhi.move(azimuth) + #ManipulatorPhi.move(azimuth) #do_scan(MOTORS, POSITIONB, REGIONSB, LATENCY) #XPS before PhD do_scan(MOTORS, POSITIONS_B, REGIONS_B, LATENCY, nn) #PhD