From fcc7b0c00f780c7496fc15ccffd5331be47a1cb0 Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Thu, 27 Jan 2022 11:50:18 +0100
Subject: [PATCH] L2SS-523: move calculate_HB_bf_delays back to beam device
---
.../tangostationcontrol/common/beamforming.py | 26 -------------------
.../tangostationcontrol/devices/beam.py | 21 +++++++++++++--
.../test/devices/test_beam_device.py | 3 +--
3 files changed, 20 insertions(+), 30 deletions(-)
delete mode 100644 tangostationcontrol/tangostationcontrol/common/beamforming.py
diff --git a/tangostationcontrol/tangostationcontrol/common/beamforming.py b/tangostationcontrol/tangostationcontrol/common/beamforming.py
deleted file mode 100644
index 768bc3bbd..000000000
--- a/tangostationcontrol/tangostationcontrol/common/beamforming.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Distributed under the terms of the APACHE license.
-# See LICENSE.txt for more info.
-
-""" Helper functions for managing beamforming calculation.
-
-"""
-
-import numpy
-
-def calculate_HBAT_bf_delays(delays: numpy.ndarray, HBAT_signal_input_delays: numpy.ndarray):
- """
- Helper function that converts a signal path delay (in seconds) to an analog beam weight,
- which is a value per tile per dipole per polarisation.
- """
- # Duplicate delay values per polarisation
- polarised_delays = numpy.tile(delays, 2) # output dims -> 96x32
-
- # Add signal input delay
- summed_delays = numpy.add(polarised_delays,HBAT_signal_input_delays)
-
- # Divide by 0.5ns and round
- HBAT_bf_delays = numpy.array(summed_delays / 0.5e-09, dtype=numpy.int64)
-
- return HBAT_bf_delays
diff --git a/tangostationcontrol/tangostationcontrol/devices/beam.py b/tangostationcontrol/tangostationcontrol/devices/beam.py
index a64471933..2ad554c3e 100644
--- a/tangostationcontrol/tangostationcontrol/devices/beam.py
+++ b/tangostationcontrol/tangostationcontrol/devices/beam.py
@@ -19,7 +19,6 @@ from tangostationcontrol.common.lofar_logging import device_logging_to_python, l
from tangostationcontrol.common.measures import get_measures_directory, use_measures_directory, download_measures, restart_python, get_available_measures_directories
from tangostationcontrol.beam.delays import delay_calculator
from tangostationcontrol.devices.device_decorators import *
-from tangostationcontrol.common.beamforming import calculate_HBAT_bf_delays
import logging
logger = logging.getLogger()
@@ -105,14 +104,32 @@ class Beam(lofar_device):
return delays
+ @staticmethod
+ def _calculate_HBAT_bf_delays(delays: numpy.ndarray, HBAT_signal_input_delays: numpy.ndarray):
+ """
+ Helper function that converts a signal path delay (in seconds) to an analog beam weight,
+ which is a value per tile per dipole per polarisation.
+ """
+ # Duplicate delay values per polarisation
+ polarised_delays = numpy.tile(delays, 2) # output dims -> 96x32
+
+ # Add signal input delay
+ summed_delays = numpy.add(polarised_delays,HBAT_signal_input_delays)
+
+ # Divide by 0.5ns and round
+ HBAT_bf_delays = numpy.array(summed_delays / 0.5e-09, dtype=numpy.int64)
+
+ return HBAT_bf_delays
+
def _HBAT_set_pointing(self, pointing_direction: numpy.array, timestamp: datetime.datetime = datetime.datetime.now()):
"""
Uploads beam weights based on a given pointing direction 2D array (96 tiles x 3 parameters)
"""
# Retrieve delays from casacore
delays = self._HBAT_delays(pointing_direction, timestamp)
+
# Convert delays into beam weights
- HBAT_bf_delays = calculate_HBAT_bf_delays(delays, self.HBAT_signal_input_delays)
+ HBAT_bf_delays = self._calculate_HBAT_bf_delays(delays, self.HBAT_signal_input_delays)
# Write weights to RECV
self.recv_proxy.HBAT_BF_delays_RW = HBAT_bf_delays
diff --git a/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py b/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py
index 4a633876d..1e0b93ffa 100644
--- a/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py
+++ b/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py
@@ -11,7 +11,6 @@ from tango import DevState
from tango.test_context import DeviceTestContext
from tangostationcontrol.devices import beam, lofar_device
-from tangostationcontrol.common.beamforming import calculate_HBAT_bf_delays
import numpy
import mock
@@ -72,5 +71,5 @@ class TestBeamDevice(base.TestCase):
# verify if values are actually transformed
HBAT_delays = proxy.HBAT_delays(numpy.array([["J2000","0deg","0deg"]] * 96).flatten())
HBAT_signal_input_delays = numpy.random.rand(96,32) # tango properties cannot be retrieved for mock devices
- HBAT_bf_delays = calculate_HBAT_bf_delays(numpy.array(HBAT_delays).reshape(96,16), HBAT_signal_input_delays)
+ HBAT_bf_delays = beam.Beam._calculate_HBAT_bf_delays(numpy.array(HBAT_delays).reshape(96,16), HBAT_signal_input_delays)
self.assertNotEqual(HBAT_delays, HBAT_bf_delays)
--
GitLab