From 1e2fa189108df709890deb2dfcc4805d7c54c10b Mon Sep 17 00:00:00 2001 From: Bram Veenboer <bram.veenboer@gmail.com> Date: Fri, 3 Jan 2020 14:06:35 +0100 Subject: [PATCH] Rename m_element_response to itsElementResponse --- DualDipoleAntenna.cc | 4 ++-- DualDipoleAntenna.h | 2 +- Station.cc | 8 ++++---- TileAntenna.cc | 4 ++-- TileAntenna.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DualDipoleAntenna.cc b/DualDipoleAntenna.cc index 89985fe3..a327867e 100644 --- a/DualDipoleAntenna.cc +++ b/DualDipoleAntenna.cc @@ -41,12 +41,12 @@ matrix22c_t DualDipoleAntenna::response(real_t freq, vector2r_t thetaphi = cart2thetaphi(direction); thetaphi[1] -= 5.0 * Constants::pi_4; matrix22c_t response; - m_element_response->element_response(freq, thetaphi[0], thetaphi[1], + itsElementResponse->element_response(freq, thetaphi[0], thetaphi[1], reinterpret_cast<std::complex<double> (&)[2][2]>(response)); return response; } -std::unique_ptr<ElementResponse> DualDipoleAntenna::m_element_response = nullptr; +std::unique_ptr<ElementResponse> DualDipoleAntenna::itsElementResponse = nullptr; } //# namespace StationResponse } //# namespace LOFAR diff --git a/DualDipoleAntenna.h b/DualDipoleAntenna.h index a51b420d..3bed6af0 100644 --- a/DualDipoleAntenna.h +++ b/DualDipoleAntenna.h @@ -52,7 +52,7 @@ public: virtual matrix22c_t response(real_t freq, const vector3r_t &direction) const final override; - static std::unique_ptr<ElementResponse> m_element_response; + static std::unique_ptr<ElementResponse> itsElementResponse; }; // @} diff --git a/Station.cc b/Station.cc index 6c1e0639..420ec8fd 100644 --- a/Station.cc +++ b/Station.cc @@ -37,11 +37,11 @@ Station::Station(const string &name, const vector3r_t &position) itsPosition(position), itsPhaseReference(position) { - if (DualDipoleAntenna::m_element_response == nullptr) { - DualDipoleAntenna::m_element_response.reset(new HamakerElementResponseLBA); + if (DualDipoleAntenna::itsElementResponse == nullptr) { + DualDipoleAntenna::itsElementResponse.reset(new HamakerElementResponseLBA); } - if (TileAntenna::m_element_response == nullptr) { - TileAntenna::m_element_response.reset(new HamakerElementResponseHBA); + if (TileAntenna::itsElementResponse == nullptr) { + TileAntenna::itsElementResponse.reset(new HamakerElementResponseHBA); } } diff --git a/TileAntenna.cc b/TileAntenna.cc index 33984812..a8b97192 100644 --- a/TileAntenna.cc +++ b/TileAntenna.cc @@ -88,12 +88,12 @@ matrix22c_t TileAntenna::elementResponse(real_t freq, thetaphi[1] -= 5.0 * Constants::pi_4; matrix22c_t response; - m_element_response->element_response(freq, thetaphi[0], thetaphi[1], + itsElementResponse->element_response(freq, thetaphi[0], thetaphi[1], reinterpret_cast<std::complex<double> (&)[2][2]>(response)); return response; } -std::unique_ptr<ElementResponse> TileAntenna::m_element_response = nullptr; +std::unique_ptr<ElementResponse> TileAntenna::itsElementResponse = nullptr; } //# namespace StationResponse } //# namespace LOFAR diff --git a/TileAntenna.h b/TileAntenna.h index 8e4eca54..7d43f2fb 100644 --- a/TileAntenna.h +++ b/TileAntenna.h @@ -63,7 +63,7 @@ public: virtual matrix22c_t elementResponse(real_t freq, const vector3r_t &direction) const final override; - static std::unique_ptr<ElementResponse> m_element_response; + static std::unique_ptr<ElementResponse> itsElementResponse; private: TileConfig itsConfig; -- GitLab