Skip to content
Snippets Groups Projects
Commit f4399cfd authored by Stefano Di Frischia's avatar Stefano Di Frischia
Browse files

L2SS-774: fix tilebeam pointing

parent 3e643080
No related branches found
No related tags found
1 merge request!358L2SS-774: configure-an-observation
......@@ -140,7 +140,7 @@ class Observation(lofar_device):
self.digitalbeam_proxy.antenna_select_RW = self._apply_saps_antenna_select(self.read_antenna_mask_R())
# Apply Tile Beam pointing direction
self.tilebeam_proxy.Pointing_direction_RW = self.read_tile_beam_R() * self.antennafield_proxy.nr_tiles_R
self.tilebeam_proxy.Pointing_direction_RW = [tuple(self.read_tile_beam_R())] * self.antennafield_proxy.nr_tiles_R
logger.info(f"Started the observation with ID={self._observation_id}.")
......@@ -233,7 +233,7 @@ class Observation(lofar_device):
def _build_tilebeam_pointing(self, parameters:dict):
""" Build the sap pointing array preserving the correct order from JSON """
pointing_direction = parameters["tile_beam"]
return [(pointing_direction['direction_type'], f"{pointing_direction['angle1']}deg", f"{pointing_direction['angle2']}deg")]
return [str(pointing_direction['direction_type']), f"{pointing_direction['angle1']}deg", f"{pointing_direction['angle2']}deg"]
def _apply_antennafield_settings(self, antenna_mask:list, filter_name:str):
""" Convert an array of antenna indexes into a boolean mask array and
......
......@@ -141,7 +141,7 @@ class TestDeviceObservation(AbstractTestBases.TestDeviceBase):
saps_subband = [ data["SAPs"][i]['subbands'] for i in range(0, num_saps)]
pointing_direction = data["SAPs"][0]['pointing']
saps_pointing = [(pointing_direction['direction_type'], f"{pointing_direction['angle1']}deg", f"{pointing_direction['angle2']}deg")]
tile_beam = [(data['tile_beam']['direction_type'], f"{data['tile_beam']['angle1']}deg", f"{data['tile_beam']['angle2']}deg")]
tile_beam = [str(data['tile_beam']['direction_type']), f"{data['tile_beam']['angle1']}deg", f"{data['tile_beam']['angle2']}deg"]
first_beamlet = data["first_beamlet"]
self.proxy.off()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment