...

mcc/mcc_ccte_erfa_new.h

@@ -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
     // returned azimuth is counted from the South through the West
     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) {
             return MccCCTE_ERFAErrorCode::ERROR_NULLPTR;
@@ -413,6 +458,8 @@ public:
 
         using real_days_t = std::chrono::duration<double, std::ratio<86400>>;
 
+        double mjd = epoch.MJD();
+
         auto tai_utc = _currentState._leapSeconds[mjd];
         if (tai_utc.has_value()) {
             double tt = mjd;
@@ -658,6 +705,10 @@ protected:
             *dec = d;
         }
 
+        if (ha) {
+            *ha = h;
+        }
+
         if (az) {
             // 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!!!