Skip to content
Snippets Groups Projects
Commit e08feb72 authored by Andre Offringa's avatar Andre Offringa
Browse files

Add missing include for use of std::runtime_error and fix C++17 uses

parent 4a747f29
No related branches found
No related tags found
No related merge requests found
......@@ -51,10 +51,10 @@ class Antenna {
vector3r_t origin;
Axes axes;
constexpr static Axes identity_axes = {
{1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, 0.0, 1.0}};
constexpr static Axes identity_axes =
Axes{{1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, 0.0, 1.0}};
constexpr static vector3r_t zero_origin = {0.0, 0.0, 0.0};
constexpr static vector3r_t zero_origin = vector3r_t{0.0, 0.0, 0.0};
};
constexpr static CoordinateSystem IdentityCoordinateSystem{
......
#include "element.h"
#include "common/mathutils.h"
#include <complex>
namespace everybeam {
Antenna::Ptr Element::Clone() const {
......@@ -17,7 +19,8 @@ matrix22c_t Element::LocalResponse(real_t time, real_t freq,
vector2r_t thetaphi = cart2thetaphi(direction);
matrix22c_t result;
static_assert(sizeof(std::complex<double>[2][2]) == sizeof(matrix22c_t));
static_assert(sizeof(std::complex<double>[2][2]) == sizeof(matrix22c_t),
"matrix22c_t has incorrect size");
element_response_->Response(
id, freq, thetaphi[0], thetaphi[1],
reinterpret_cast<std::complex<double>(&)[2][2]>(result));
......
......@@ -24,7 +24,8 @@
#include "factorialtable.h"
#include "recursivelock.h"
namespace everybeam::mwabeam {
namespace everybeam {
namespace mwabeam {
/*
Structure for Jones matrix :
......@@ -244,5 +245,6 @@ class Beam2016Implementation {
std::mutex mutex_;
};
} // namespace everybeam::mwabeam
} // namespace mwabeam
} // namespace everybeam
#endif
......@@ -5,7 +5,8 @@
#include <aocommon/uvector.h>
namespace everybeam::mwabeam {
namespace everybeam {
namespace mwabeam {
class FactorialTable {
public:
FactorialTable(size_t nprecalculated) : table_(nprecalculated) {
......@@ -27,5 +28,6 @@ class FactorialTable {
private:
aocommon::UVector<double> table_;
};
} // namespace everybeam::mwabeam
} // namespace mwabeam
} // namespace everybeam
#endif // EVERYBEAM_MWABEAM_FACTORIALTABLE_H_
......@@ -5,7 +5,8 @@
#include <mutex>
#include <system_error>
namespace everybeam::mwabeam {
namespace everybeam {
namespace mwabeam {
template <typename Mutex>
class RecursiveLock {
......@@ -101,5 +102,6 @@ class RecursiveLock {
Mutex* mutex_;
size_t nlocks_;
};
} // namespace everybeam::mwabeam
} // namespace mwabeam
} // namespace everybeam
#endif // EVERYBEAM_MWABEAM_RECURSIVELOCK_H_
......@@ -4,7 +4,8 @@
#include <casacore/measures/Measures/MCPosition.h>
#include <casacore/measures/Measures/MeasConvert.h>
namespace everybeam::mwabeam {
namespace everybeam {
namespace mwabeam {
TileBeam2016::TileBeam2016(const double* delays, bool frequency_interpolation,
const std::string& coeff_path)
......@@ -54,4 +55,5 @@ void TileBeam2016::GetTabulatedResponse(double az, double za, double freq,
result[2] = jones.j10;
result[3] = jones.j11;
}
} // namespace everybeam::mwabeam
} // namespace mwabeam
} // namespace everybeam
#include <iostream>
#include <cassert>
#include <stdexcept>
#include "oskardataset.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment