Commit 94d8b40a8aad3894222f59c506140aae81429940
1 parent
96ba366e
Makes correction to GWcs::solidangle
Showing
1 changed file
with
5 additions
and
6 deletions
src/sky/GWcs.cpp
| ... | ... | @@ -440,14 +440,13 @@ double GWcs::solidangle(const GSkyPixel& pixel) const |
| 440 | 440 | GVector vec3 = dir3.celvector(); |
| 441 | 441 | GVector vec4 = dir4.celvector(); |
| 442 | 442 | |
| 443 | - double angle1 = std::acos(cross(vec2, (cross(vec1, vec2))) * cross(vec2, (cross(vec3, vec2)))); | |
| 444 | - double angle2 = std::acos(cross(vec3, (cross(vec2, vec3))) * cross(vec3, (cross(vec4, vec3)))); | |
| 445 | - double angle3 = std::acos(cross(vec4, (cross(vec3, vec4))) * cross(vec4, (cross(vec1, vec4)))); | |
| 446 | - double angle4 = std::acos(cross(vec1, (cross(vec4, vec1))) * cross(vec1, (cross(vec2, vec1)))); | |
| 443 | + double angle1 = gammalib::acos(cross(vec2, (cross(vec1, vec2))) * cross(vec2, (cross(vec3, vec2)))); | |
| 444 | + double angle2 = gammalib::acos(cross(vec3, (cross(vec2, vec3))) * cross(vec3, (cross(vec4, vec3)))); | |
| 445 | + double angle3 = gammalib::acos(cross(vec4, (cross(vec3, vec4))) * cross(vec4, (cross(vec1, vec4)))); | |
| 446 | + double angle4 = gammalib::acos(cross(vec1, (cross(vec4, vec1))) * cross(vec1, (cross(vec2, vec1)))); | |
| 447 | 447 | |
| 448 | 448 | // http://mathworld.wolfram.com/SphericalPolygon.html |
| 449 | - double solidangle = (angle1 + angle2 + angle3 + angle4) - (2 * gammalib::pi); | |
| 450 | - | |
| 449 | + double solidangle = ((gammalib::pi * (1.0/180.0)) * (gammalib::pi * (1.0/180.0))) + (angle1 + angle2 + angle3 + angle4) - (2.0 * gammalib::pi); | |
| 451 | 450 | // Return solid angle |
| 452 | 451 | return solidangle; |
| 453 | 452 | } | ... | ... |