eddy/mountcontrol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Timur A. Fatkhullin 2026-01-15 23:21:28 +03:00
parent 01d5657b1b
commit 0aa0113be3
3 changed files with 140 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
mcc/mcc_ccte_erfa_new.h
View File

@ -250,6 +250,51 @@ public:
} }
// apparent sideral time (Greenwitch or local)
error_t apparentSideralTime(mcc_coord_epoch_c auto const& epoch, mcc_angle_c auto* st, bool islocal = false)
{
error_t ret = MccCCTE_ERFAErrorCode::ERROR_OK;
if (st == nullptr) {
return MccCCTE_ERFAErrorCode::ERROR_NULLPTR;
}
using real_days_t = std::chrono::duration<double, std::ratio<86400>>;
double ut1 = epoch.MJD();
double tt = epoch.MJD();
std::lock_guard lock{*_stateMutex};
auto dut1 = _currentState._bulletinA.DUT1(epoch.MJD());
if (dut1.has_value()) {
ut1 += std::chrono::duration_cast<real_days_t>(dut1.value()).count();
} else { // out of range
return MccCCTE_ERFAErrorCode::ERROR_BULLETINA_OUT_OF_RANGE;
}
auto tai_utc = _currentState._leapSeconds[epoch.MJD()];
if (tai_utc.has_value()) {
tt += std::chrono::duration_cast<real_days_t>(tai_utc.value()).count();
} else {
return MccCCTE_ERFAErrorCode::ERROR_LEAPSECONDS_OUT_OF_RANGE;
}
auto tt_tai = _currentState._bulletinA.TT_TAI();
tt += std::chrono::duration_cast<real_days_t>(tt_tai).count();
*st = eraGst06a(ERFA_DJM0, ut1, ERFA_DJM0, tt);
if (islocal) {
*st = eraAnp(*st + _currentState.lon);
}
return ret;
}
// ICRS to observed // ICRS to observed
// returned azimuth is counted from the South through the West // returned azimuth is counted from the South through the West
error_t icrsToObs(mcc_angle_c auto const& ra_icrs, error_t icrsToObs(mcc_angle_c auto const& ra_icrs,
@ -401,7 +446,7 @@ public:
} }
error_t equationOrigins(const mcc_julday_c auto& mjd, mcc_angle_c auto* eo) error_t equationOrigins(mcc_coord_epoch_c auto const& epoch, mcc_angle_c auto* eo)
{ {
if (eo == nullptr) { if (eo == nullptr) {
return MccCCTE_ERFAErrorCode::ERROR_NULLPTR; return MccCCTE_ERFAErrorCode::ERROR_NULLPTR;
@ -413,6 +458,8 @@ public:
using real_days_t = std::chrono::duration<double, std::ratio<86400>>; using real_days_t = std::chrono::duration<double, std::ratio<86400>>;
double mjd = epoch.MJD();
auto tai_utc = _currentState._leapSeconds[mjd]; auto tai_utc = _currentState._leapSeconds[mjd];
if (tai_utc.has_value()) { if (tai_utc.has_value()) {
double tt = mjd; double tt = mjd;
@ -658,6 +705,10 @@ protected:
*dec = d; *dec = d;
} }
if (ha) {
*ha = h;
}
if (az) { if (az) {
// NOTE: according to definition of astronomical azimuth it is counted from the South through the West, but // NOTE: according to definition of astronomical azimuth it is counted from the South through the West, but
// in the ERFA the azimuth is counted from the North through the East!!! // in the ERFA the azimuth is counted from the North through the East!!!

110
mcc/mcc_coord.h
View File

@ -31,13 +31,13 @@ public:
? MccCoordPairKind::COORDS_KIND_RADEC_APP ? MccCoordPairKind::COORDS_KIND_RADEC_APP
// observed RA and DEC // observed RA and DEC
: (std::same_as<CO_LON_T, MccAngleRA_OBS> && std::same_as<CO_LAT_T, MccAngleDEC_OBS>) : (std::same_as<CO_LON_T, MccAngleRA_OBS> && std::same_as<CO_LAT_T, MccAngleDEC_OBS>)
? MccCoordPairKind::COORDS_KIND_RADEC_APP ? MccCoordPairKind::COORDS_KIND_RADEC_OBS
// apparent HA and DEC // apparent HA and DEC
: (std::same_as<CO_LON_T, MccAngleHA_APP> && std::same_as<CO_LAT_T, MccAngleDEC_APP>) : (std::same_as<CO_LON_T, MccAngleHA_APP> && std::same_as<CO_LAT_T, MccAngleDEC_APP>)
? MccCoordPairKind::COORDS_KIND_HADEC_APP ? MccCoordPairKind::COORDS_KIND_HADEC_APP
// observed HA and DEC // observed HA and DEC
: (std::same_as<CO_LON_T, MccAngleHA_OBS> && std::same_as<CO_LAT_T, MccAngleDEC_OBS>) : (std::same_as<CO_LON_T, MccAngleHA_OBS> && std::same_as<CO_LAT_T, MccAngleDEC_OBS>)
? MccCoordPairKind::COORDS_KIND_HADEC_APP ? MccCoordPairKind::COORDS_KIND_HADEC_OBS
// apparent AZ and ZD // apparent AZ and ZD
: (std::same_as<CO_LON_T, MccAngleAZ> && std::same_as<CO_LAT_T, MccAngleZD>) : (std::same_as<CO_LON_T, MccAngleAZ> && std::same_as<CO_LAT_T, MccAngleZD>)
? MccCoordPairKind::COORDS_KIND_AZZD ? MccCoordPairKind::COORDS_KIND_AZZD
@ -132,6 +132,11 @@ template <mcc_angle_c CO_LON_T, mcc_angle_c CO_LAT_T>
class MccNamedCoordPair : public MccCoordPair<CO_LON_T, CO_LAT_T> class MccNamedCoordPair : public MccCoordPair<CO_LON_T, CO_LAT_T>
{ {
public: public:
MccNamedCoordPair() : MccCoordPair<CO_LON_T, CO_LAT_T>(CO_LON_T{0.0}, CO_LAT_T{0.0}, MccCelestialCoordEpoch::now())
{
}
template <typename CxT, typename CyT, mcc_coord_epoch_c EpT = MccCelestialCoordEpoch> template <typename CxT, typename CyT, mcc_coord_epoch_c EpT = MccCelestialCoordEpoch>
requires(std::is_arithmetic_v<CxT> && std::is_arithmetic_v<CyT>) requires(std::is_arithmetic_v<CxT> && std::is_arithmetic_v<CyT>)
MccNamedCoordPair(CxT const& x, CyT const& y, EpT const& epoch = EpT::now()) MccNamedCoordPair(CxT const& x, CyT const& y, EpT const& epoch = EpT::now())
@ -166,7 +171,7 @@ struct MccSkyRADEC_ICRS : MccNamedCoordPair<MccAngleRA_ICRS, MccAngleDEC_ICRS> {
MccSkyRADEC_ICRS(MccAngle const& x, MccAngle const& y) : MccSkyRADEC_ICRS((double)x, (double)y) {} MccSkyRADEC_ICRS(MccAngle const& x, MccAngle const& y) : MccSkyRADEC_ICRS((double)x, (double)y) {}
// ignore epoch setting (it is always J2000.0) // ignore epoch setting (it is always J2000.0)
void setEpoch(mcc_coord_epoch_c auto const& ep) void setEpoch(mcc_coord_epoch_c auto const&)
{ {
static_assert(false, "CANNOT SET EPOCH FOR ICRS-KIND COORDINATE PAIR!!!"); static_assert(false, "CANNOT SET EPOCH FOR ICRS-KIND COORDINATE PAIR!!!");
} }
@ -403,33 +408,33 @@ protected:
return; return;
} else { // from ICRS to apparent or observed } else { // from ICRS to apparent or observed
if constexpr (mccIsAppCoordPairKind<PT::pairKind>) { // if constexpr (mccIsAppCoordPairKind<PT::pairKind>) {
ccte_err = cctEngine.icrsToApp(_x, _y, cpair.epoch(), &ra, &dec, &ha, &az, &zd); // ccte_err = cctEngine.icrsToApp(_x, _y, cpair.epoch(), &ra, &dec, &ha, &az, &zd);
} else if constexpr (mccIsObsCoordPairKind<PT::pairKind>) { // } else if constexpr (mccIsObsCoordPairKind<PT::pairKind>) {
ccte_err = cctEngine.icrsToObs(_x, _y, cpair.epoch(), &ra, &dec, &ha, &az, &zd); // ccte_err = cctEngine.icrsToObs(_x, _y, cpair.epoch(), &ra, &dec, &ha, &az, &zd);
} else { // } else {
static_assert(true, "UNSUPPORTED SKY POINT TRANSFORMATION!"); // static_assert(true, "UNSUPPORTED SKY POINT TRANSFORMATION!");
} // }
if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_RADEC_APP || // if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_RADEC_APP ||
PT::pairKind == MccCoordPairKind::COORDS_KIND_RADEC_OBS) { // PT::pairKind == MccCoordPairKind::COORDS_KIND_RADEC_OBS) {
cpair.setX(ra); // cpair.setX(ra);
cpair.setY(dec); // cpair.setY(dec);
} else if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_HADEC_APP || // } else if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_HADEC_APP ||
PT::pairKind == MccCoordPairKind::COORDS_KIND_HADEC_OBS) { // PT::pairKind == MccCoordPairKind::COORDS_KIND_HADEC_OBS) {
cpair.setX(ha); // cpair.setX(ha);
cpair.setY(dec); // cpair.setY(dec);
} else if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_AZZD) { // } else if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_AZZD) {
cpair.setX(az); // cpair.setX(az);
cpair.setY(zd); // cpair.setY(zd);
} else if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_AZALT) { // } else if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_AZALT) {
cpair.setX(az); // cpair.setX(az);
cpair.setY(half_pi - zd); // cpair.setY(half_pi - zd);
} else { // } else {
static_assert(true, "UNSUPPORTED SKY POINT TRANSFORMATION!"); // static_assert(true, "UNSUPPORTED SKY POINT TRANSFORMATION!");
} // }
return; // return;
} }
} }
@ -476,11 +481,17 @@ protected:
// here, the input coordinates and stored one are at the same epoch // here, the input coordinates and stored one are at the same epoch
ccte_err = cctEngine.equationOrigins(cpair.MJD(), &eo); ccte_err = cctEngine.equationOrigins(cpair.epoch(), &eo);
if (ccte_err) { if (ccte_err) {
return; return;
} }
ccte_err = cctEngine.apparentSideralTime(cpair.epoch(), &lst, true);
if (ccte_err) {
return;
}
if (pkind == MccCoordPairKind::COORDS_KIND_RADEC_APP || pkind == MccCoordPairKind::COORDS_KIND_RADEC_OBS) { if (pkind == MccCoordPairKind::COORDS_KIND_RADEC_APP || pkind == MccCoordPairKind::COORDS_KIND_RADEC_OBS) {
ra = _x; ra = _x;
dec = _y; dec = _y;
@ -494,16 +505,43 @@ protected:
} else if (pkind == MccCoordPairKind::COORDS_KIND_AZALT) { } else if (pkind == MccCoordPairKind::COORDS_KIND_AZALT) {
az = _x; az = _x;
alt = _y; alt = _y;
} else if (pkind == MccCoordPairKind::COORDS_KIND_RADEC_ICRS) {
ra_icrs = _x;
dec_icrs = _y;
} else { // unsupported transformation!!!
return;
} }
// else if (pkind == MccCoordPairKind::COORDS_KIND_RADEC_ICRS) {
// ra_icrs = _x;
// dec_icrs = _y;
// } else { // unsupported transformation!!!
// return;
// }
// coordinate transformation lambda (possibly recursive!!!) // coordinate transformation lambda (possibly recursive!!!)
auto comp_func = [&, this](this auto&& self, MccCoordPairKind cp_kind) -> void { auto comp_func = [&](this auto&& self, MccCoordPairKind cp_kind) -> void {
if (cp_kind == MccCoordPairKind::COORDS_KIND_AZALT) { if (cp_kind == MccCoordPairKind::COORDS_KIND_RADEC_ICRS) {
if constexpr (mccIsAppCoordPairKind<PT::pairKind>) {
ccte_err = cctEngine.icrsToApp(ra_icrs, dec_icrs, cpair.epoch(), &ra, &dec, &ha, &az, &zd);
} else if constexpr (mccIsObsCoordPairKind<PT::pairKind>) {
ccte_err = cctEngine.icrsToObs(ra_icrs, dec_icrs, cpair.epoch(), &ra, &dec, &ha, &az, &zd);
} else {
static_assert(true, "UNSUPPORTED SKY POINT TRANSFORMATION!");
}
if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_RADEC_APP ||
PT::pairKind == MccCoordPairKind::COORDS_KIND_RADEC_OBS) {
cpair.setX(ra);
cpair.setY(dec);
} else if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_HADEC_APP ||
PT::pairKind == MccCoordPairKind::COORDS_KIND_HADEC_OBS) {
cpair.setX(ha);
cpair.setY(dec);
} else if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_AZZD) {
cpair.setX(az);
cpair.setY(zd);
} else if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_AZALT) {
cpair.setX(az);
cpair.setY(half_pi - zd);
} else {
static_assert(true, "UNSUPPORTED SKY POINT TRANSFORMATION!");
}
} else if (cp_kind == MccCoordPairKind::COORDS_KIND_AZALT) {
if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_AZZD) { if constexpr (PT::pairKind == MccCoordPairKind::COORDS_KIND_AZZD) {
zd = half_pi - alt; zd = half_pi - alt;
cpair.setX(az); cpair.setX(az);

18
mcc/tests/mcc_coord_test.cpp
View File

@ -23,15 +23,23 @@ int main()
skypt_t::cctEngine.setStateERFA(saoras); skypt_t::cctEngine.setStateERFA(saoras);
skypt_t pt; skypt_t pt;
MccSkyRADEC_ICRS icrs(0.0, 0.0); MccSkyRADEC_ICRS icrs(0.0, 30.0_degs);
pt = icrs; pt = icrs;
MccSkyRADEC_OBS radec_obs{0.0, 0.0}; MccSkyRADEC_OBS radec_obs{0.0, 0.0};
MccSkyRADEC_APP radec_app;
MccSkyAZALT azalt{0, 0}; MccSkyAZALT azalt{0, 0};
MccSkyAZZD azzd{0, 0}; MccSkyAZZD azzd{0, 0};
MccSkyHADEC_OBS hadec_obs;
MccAngle eo, lst;
pt.to(radec_obs, azalt, azzd); skypt_t::cctEngine.equationOrigins(radec_obs.epoch(), &eo);
skypt_t::cctEngine.apparentSideralTime(radec_obs.epoch(), &lst, true);
std::cout << "EO = " << eo.sexagesimal(true) << "\n";
std::cout << "LST = " << lst.sexagesimal(true) << "\n\n";
pt.to(radec_obs, azalt, azzd, radec_app);
std::cout << "FROM ICRS TO OBSERVED:\n"; std::cout << "FROM ICRS TO OBSERVED:\n";
std::cout << "RA_ICRS = " << icrs.x().sexagesimal(true) << "\n"; std::cout << "RA_ICRS = " << icrs.x().sexagesimal(true) << "\n";
@ -42,11 +50,13 @@ int main()
std::cout << "AZ = " << azalt.x().sexagesimal() << "\n"; std::cout << "AZ = " << azalt.x().sexagesimal() << "\n";
std::cout << "ALT = " << azalt.y().sexagesimal() << "\n"; std::cout << "ALT = " << azalt.y().sexagesimal() << "\n";
std::cout << "ZD = " << azzd.y().sexagesimal() << "\n"; std::cout << "ZD = " << azzd.y().sexagesimal() << "\n";
std::cout << "RA_APP = " << radec_app.x().sexagesimal(true) << "\n";
std::cout << "DEC_APP = " << radec_app.y().sexagesimal() << "\n";
// radec_obs = {10.2387983_degs, "43:21:34.5465"_dms}; // radec_obs = {10.2387983_degs, "43:21:34.5465"_dms};
pt = radec_obs; pt = radec_obs;
pt.to(icrs); pt.to(icrs, azzd, hadec_obs);
std::cout << "\n\nFROM OBSERVED TO ICRS:\n"; std::cout << "\n\nFROM OBSERVED TO ICRS:\n";
std::cout << "OBS COORD EPOCH: " << radec_obs.epoch().UTC() << "\n"; std::cout << "OBS COORD EPOCH: " << radec_obs.epoch().UTC() << "\n";
@ -55,11 +65,11 @@ int main()
std::cout << "RA_ICRS = " << icrs.x().sexagesimal(true) << "\n"; std::cout << "RA_ICRS = " << icrs.x().sexagesimal(true) << "\n";
std::cout << "DEC_ICRS = " << icrs.y().sexagesimal() << "\n"; std::cout << "DEC_ICRS = " << icrs.y().sexagesimal() << "\n";
pt.to(azzd);
std::cout << "\n\nFROM OBSERVED TO OBSERVED:\n"; std::cout << "\n\nFROM OBSERVED TO OBSERVED:\n";
std::cout << "OBS COORD EPOCH: " << radec_obs.epoch().UTC() << "\n"; std::cout << "OBS COORD EPOCH: " << radec_obs.epoch().UTC() << "\n";
std::cout << "RA_OBS = " << radec_obs.x().sexagesimal(true) << "\n"; std::cout << "RA_OBS = " << radec_obs.x().sexagesimal(true) << "\n";
std::cout << "DEC_OBS = " << radec_obs.y().sexagesimal() << "\n"; std::cout << "DEC_OBS = " << radec_obs.y().sexagesimal() << "\n";
std::cout << "HA_OBS = " << hadec_obs.x().sexagesimal(true) << "\n";
std::cout << "AZ = " << azzd.x().sexagesimal() << "\n"; std::cout << "AZ = " << azzd.x().sexagesimal() << "\n";
std::cout << "ZD = " << azzd.y().sexagesimal() << "\n"; std::cout << "ZD = " << azzd.y().sexagesimal() << "\n";