Skip to content
Snippets Groups Projects
Commit eda5263e authored by Jakob Maljaars's avatar Jakob Maljaars
Browse files

Merge branch '32-more-google-style' into 'master'

Resolve "Make file/function namings google compliant"

Closes #32

See merge request !33
parents 1949af17 d7b1f71a
Branches
Tags
1 merge request!33Resolve "Make file/function namings google compliant"
Pipeline #2779 passed
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <aocommon/imagecoordinates.h> #include <aocommon/imagecoordinates.h>
#include <fitsio.h> #include <fitsio.h>
#include "./../cpp/common/MathUtil.h" #include "./../cpp/common/math_utils.h"
// #include "./../cpp/coords/ITRFDirection.h" // #include "./../cpp/coords/ITRFDirection.h"
#include "./../cpp/coords/ITRFConverter.h" #include "./../cpp/coords/ITRFConverter.h"
......
#include "./../cpp/ElementResponse.h" #include "./../cpp/element_response.h"
#include "./../cpp/Station.h" #include "./../cpp/station.h"
#include "./../cpp/LofarMetaDataUtil.h" #include "./../cpp/LofarMetaDataUtil.h"
#include "./../cpp/coords/coord_utils.h" #include "./../cpp/coords/coord_utils.h"
......
...@@ -29,7 +29,7 @@ int main(int argc, char** argv){ ...@@ -29,7 +29,7 @@ int main(int argc, char** argv){
double y = (2.0*j)/(N-1) - 1.0; double y = (2.0*j)/(N-1) - 1.0;
double theta = asin(sqrt(x*x + y*y)); double theta = asin(sqrt(x*x + y*y));
double phi = atan2(y,x); double phi = atan2(y,x);
element_response.response(0, freq, theta, phi, result_arr[i][j]); element_response.Response(0, freq, theta, phi, result_arr[i][j]);
} }
} }
......
...@@ -26,7 +26,7 @@ void calculateElementBeams(everybeam::Station::Ptr& station, ...@@ -26,7 +26,7 @@ void calculateElementBeams(everybeam::Station::Ptr& station,
// Compute gain // Compute gain
std::complex<double> gainMatrix[2][2] = {0.0}; std::complex<double> gainMatrix[2][2] = {0.0};
if (std::isfinite(theta) && std::isfinite(phi)) { if (std::isfinite(theta) && std::isfinite(phi)) {
elementResponse->response(a, frequency, theta, phi, gainMatrix); elementResponse->Response(a, frequency, theta, phi, gainMatrix);
} }
// Store gain // Store gain
......
#include <iostream> #include <iostream>
#include "./../cpp/Station.h" #include "./../cpp/station.h"
#include "./../cpp/LofarMetaDataUtil.h" #include "./../cpp/LofarMetaDataUtil.h"
#include "./../cpp/common/MathUtil.h" #include "./../cpp/common/math_utils.h"
#include "config.h" #include "config.h"
...@@ -24,19 +24,19 @@ int main() { ...@@ -24,19 +24,19 @@ int main() {
// Element(station.get_element_response(),0)); auto antenna1 = // Element(station.get_element_response(),0)); auto antenna1 =
// Element::Ptr(new Element(station.get_element_response(),1)); // Element::Ptr(new Element(station.get_element_response(),1));
// //
// station.set_antenna(antenna0); // station.SetAntenna(antenna0);
// //
// std::cout << response[0][0] << std::endl; // std::cout << response[0][0] << std::endl;
// //
// response = station.response(time, freq, direction); // Response = station.Response(time, freq, direction);
// //
// std::cout << response[0][0] << std::endl; // std::cout << response[0][0] << std::endl;
// //
// auto beam_former = BeamFormer::Ptr(new BeamFormer()); // auto beam_former = BeamFormer::Ptr(new BeamFormer());
// beam_former->add_antenna(antenna0); // beam_former->AddAntenna(antenna0);
// beam_former->add_antenna(antenna1); // beam_former->AddAntenna(antenna1);
// station.set_antenna(beam_former); // station.SetAntenna(beam_former);
// response = station.response(time, freq, direction); // Response = station.Response(time, freq, direction);
// std::cout << response[0][0] << std::endl; // std::cout << response[0][0] << std::endl;
// //
...@@ -61,7 +61,7 @@ int main() { ...@@ -61,7 +61,7 @@ int main() {
auto d = direction; auto d = direction;
d[1] = -0.2 + 0.04 * i; d[1] = -0.2 + 0.04 * i;
d = normalize(d); d = normalize(d);
response = station->response(time, freq, d, freq_beamformer, response = station->Response(time, freq, d, freq_beamformer,
station_pointing, tile_pointing); station_pointing, tile_pointing);
std::cout << response[0][0] << " " << response[0][1] << " " std::cout << response[0][0] << " " << response[0][1] << " "
<< response[1][0] << " " << response[1][1] << " " << std::endl; << response[1][0] << " " << response[1][1] << " " << std::endl;
......
...@@ -21,7 +21,7 @@ void calculateStationBeams(std::vector<everybeam::Station::Ptr>& stations, ...@@ -21,7 +21,7 @@ void calculateStationBeams(std::vector<everybeam::Station::Ptr>& stations,
auto direction = itrfDirections[y * subgrid_size + x]; auto direction = itrfDirections[y * subgrid_size + x];
auto freq_beamformer = frequency; auto freq_beamformer = frequency;
matrix22c_t gainMatrix = matrix22c_t gainMatrix =
stations[s]->response(time, frequency, direction, freq_beamformer, stations[s]->Response(time, frequency, direction, freq_beamformer,
stationDirection, tileDirection); stationDirection, tileDirection);
std::complex<float>* antBufferPtr = (*data_ptr)[s][y][x]; std::complex<float>* antBufferPtr = (*data_ptr)[s][y][x];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment