mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
Malin Ejdbo
2021-06-29 10:06:19 +02:00
parent 2c47735757
commit 9dc2b3348b
2 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/util/coordinateconversion.h
+11 -10
View File
@@ -31,27 +31,27 @@
namespace openspace {
/**
* Converts from ICRS coordinates to galactic cartesian coordinates.
* Converts from ICRS decimal degrees coordinates to galactic cartesian coordinates.
* \param ra Right ascension, given in decimal degrees
* \param dec Declination, given in decimal degrees
* \param distance The distance, or radius, to the position given in any unit.
* \param boolean to say if the incoming ra and dec are in degrees or radians
* \param isDegrees Boolean to say if the incoming ra and dec are in degrees or radians
* \return A position in galactic cartesian coordinates, given in the same unit as the
* distance parameter.
*/
glm::dvec3 icrsToGalacticCartesian(double ra, double dec, double distance, bool isDegrees = true);
glm::dvec3 icrsToGalacticCartesian(double ra, double dec, double distance,
bool isDegrees = true);
/**
* Converts from ICRS (hms and dms) coordinates to decimal degrees.
* \param ra Right ascension, given as a string in format "XXhYYmZZs"
* \param dec Declination, given as a string in format "XXdYYmZZs", "-XXdYYmZZs",
* "XdYmZs" or "-XdYmZs"
* \param ra Right ascension, given as a string in format 'XhYmZs'
* \param dec Declination, given as a string in format 'XdYmZs'
* \return The decimal degrees coordinate in degrees
*/
glm::dvec2 icrsToDecimalDegrees(const std::string& ra, const std::string& dec);
/**
* Converts from galactic cartesian coordinates to ICRS coordinates in decimal degrees
* Converts from galactic cartesian coordinates to ICRS decimal degrees coordinates
* and distance.
* \param x X coordinate
* \param y Y coordinate
@@ -61,13 +61,14 @@ glm::dvec2 icrsToDecimalDegrees(const std::string& ra, const std::string& dec);
glm::dvec3 galacticCartesianToIcrs(double x, double y, double z);
/**
* Converts from ICRS (decimal degrees) coordinates to ICRS (hms and dms) coordinates.
* Converts from ICRS decimal degrees coordinates to ICRS hms and dms coordinates.
* \param ra Right ascension, given in decimal degrees
* \param dec Declination, given in decimal degrees
* \param boolean to say if the incoming ra and dec are in degrees or radians
* \param isDegrees Boolean to say if the incoming ra and dec are in degrees or radians
* \return A pair with the ra and dec strings in hms and dms format.
*/
std::pair<std::string, std::string> decimalDegreesToIcrs(double ra, double dec, bool isDegrees = true);
std::pair<std::string, std::string> decimalDegreesToIcrs(double ra, double dec,
bool isDegrees = true);
} // namespace openspace
src/util/coordinateconversion.cpp
+24 -35
View File
@@ -31,17 +31,17 @@
namespace {
constexpr const char* _loggerCat = "Coordinateconversion";
// J2000 Galactic reference frame
constexpr double A0 = glm::radians(192.8595); // Equatorial coordinates of the Galactic north pole
constexpr double D0 = glm::radians(27.1284);
constexpr double L0 = glm::radians(122.9320); // Galactic longitude of the equatorial north pole
void parseString(const std::string& str, int& hours_or_degrees, int& minutes,
double& seconds)
{
// Find hms or dms indicies
size_t h_or_d_index;
if (str.find('h') != std::string::npos) {
h_or_d_index = str.find('h');
}
else {
h_or_d_index = str.find('d');
}
size_t h_or_d_index =
(str.find('h') != std::string::npos) ? str.find('h') : str.find('d');
size_t m_index = str.find('m');
size_t s_index = str.find('s');
if (h_or_d_index == std::string::npos || m_index == std::string::npos ||
@@ -104,8 +104,7 @@ namespace {
{
if (dec.find('h') != std::string::npos) {
throw(ghoul::lua::LuaRuntimeException(fmt::format(
"Dec '{}' format is incorrect. Correct format is: "
"Dec 'XXdYYmZZs', '-XXdYYmZZs', 'XdYmZs' or '-XdYmZs'", dec))
"Dec '{}' format is incorrect. Correct format is: 'XdYmZs'", dec))
);
}
parseString(dec, degrees, minutes, seconds);
@@ -178,17 +177,12 @@ glm::dvec3 icrsToGalacticCartesian(double ra, double dec, double distance,
double a = isDegrees ? glm::radians(ra) : ra;
double d = isDegrees ? glm::radians(dec) : dec;
// J2000 Galactic reference frame
constexpr double a0 = glm::radians(192.8595); // Equatorial coordinates of the Galactic north pole
constexpr double d0 = glm::radians(27.1284);
constexpr double l0 = glm::radians(122.9320); // Galactic longitude of the equatorial north pole
// Convert to galactic reference frame
double l = l0 - atan2(
cos(d) * sin(a - a0),
sin(d) * cos(d0) - cos(d) * sin(d0) * cos(a - a0)
double l = L0 - atan2(
cos(d) * sin(a - A0),
sin(d) * cos(D0) - cos(d) * sin(D0) * cos(a - A0)
);
double b = asin(sin(d) * sin(d0) + cos(d) * cos(d0) * cos(a - a0));
double b = asin(sin(d) * sin(D0) + cos(d) * cos(D0) * cos(a - A0));
// Convert to cartesian
glm::dvec3 rGalactic = glm::dvec3(
@@ -200,8 +194,9 @@ glm::dvec3 icrsToGalacticCartesian(double ra, double dec, double distance,
return distance * rGalactic;
}
// Ra format "XXhYYmZZs" or "XhYmZs"
// Dec format "XXdYYmZZs", "-XXdYYmZZs", "XdYmZs" or "-XdYmZs"
// Ra format 'XhYmZs', where X and Y are positive integers and Z is a positive double
// Dec format 'XdYmZs', where X is a signed integer, Y is a positive integer and Z is a
// positive double
glm::dvec2 icrsToDecimalDegrees(const std::string& ra, const std::string& dec) {
// Reference:
// https://math.stackexchange.com/questions/15323/how-do-i-calculate-the-cartesian-coordinates-of-stars
@@ -230,7 +225,7 @@ glm::dvec2 icrsToDecimalDegrees(const std::string& ra, const std::string& dec) {
);
}
// Convert from hours, minutes, seconds to decimal degrees
// Convert from hours/degrees, minutes, seconds to decimal degrees
double sign = signbit(static_cast<float>(dec_degrees)) ? -1.0 : 1.0;
double ra_deg = (ra_hours * 15.0) +
(ra_minutes * 15.0 / 60.0) +
@@ -243,15 +238,15 @@ glm::dvec2 icrsToDecimalDegrees(const std::string& ra, const std::string& dec) {
return glm::dvec2(ra_deg, dec_deg);
}
// Convert Galactic coordinates (x, y, z) or (l, b) into
// Equatorial coordinates ICRS right ascension and declination (a, d) plus distance
// Convert Galactic coordinates (x, y, z) or (l, b) into Equatorial coordinates ICRS
// right ascension and declination in decimal degrees (a, d) plus distance
glm::dvec3 galacticCartesianToIcrs(double x, double y, double z) {
// References:
// https://www.atnf.csiro.au/people/Tobias.Westmeier/tools_coords.php,
// https://en.wikipedia.org/wiki/Celestial_coordinate_system
// Normalize
double distance = sqrt(x * x + y * y + z * z);
double distance = sqrt(x*x + y*y + z*z);
double n_x = x / distance;
double n_y = y / distance;
double n_z = z / distance;
@@ -261,20 +256,14 @@ glm::dvec3 galacticCartesianToIcrs(double x, double y, double z) {
double l = atan2(n_y, n_x);
double b = asin(n_z);
// J2000 Galactic reference frame
constexpr double a0 = glm::radians(192.8595); // Equatorial coordinates of the Galactic north pole
constexpr double d0 = glm::radians(27.1284);
constexpr double l0 = glm::radians(122.9320); // Galactic longitude of the equatorial north pole
// Convert to equatorial reference frame
double a = atan2(
cos(b) * sin(l0 - l),
sin(b) * cos(d0) - cos(b) * sin(d0) * cos(l0 - l)
) + a0;
double d = asin(sin(b) * sin(d0) + cos(b) * cos(d0) * cos(l0 - l));
cos(b) * sin(L0 - l),
sin(b) * cos(D0) - cos(b) * sin(D0) * cos(L0 - l)
) + A0;
double d = asin(sin(b) * sin(D0) + cos(b) * cos(D0) * cos(L0 - l));
glm::dvec3 rEquatorial = glm::dvec3(glm::degrees(a), glm::degrees(d), distance);
return rEquatorial;
return glm::dvec3(glm::degrees(a), glm::degrees(d), distance);
}
// Return a pair with two formatted strings from the decimal degrees ra and dec