Alignment: deprecate old Transform* shims, migrate all in-tree callers to *JD

Mark MathPluginManagement::TransformCelestialToTelescope and
TransformTelescopeToCelestial [[deprecated]] so callers get compiler
warnings. Thread an explicit JD parameter through
AlignmentSubsystemForDrivers (default = ln_get_julian_from_sys() for
source compatibility), and update all in-tree driver and example call
sites to use TransformCelestialToTelescopeJD / TransformTelescopeToCelestialJD
directly.

skywatcherAPIMount non-zero offset sites (JulianOffset axis, bracket
tracking) now compute the absolute JD explicitly before calling *JD
instead of passing a relative offset. The JDnow variable is hoisted
before the if/else so both branches share the same sample.

External math plugins are unaffected: MathPlugin.h pure virtuals
are intentionally left un-deprecated.

Author: ckemper67

drivers/telescope/astrotrac.cpp

@@ -682,7 +682,7 @@ bool AstroTrac::ReadScopeStatus()
     m_MountInternalCoordinates.declination = de;
     TDV = TelescopeDirectionVectorFromEquatorialCoordinates(m_MountInternalCoordinates);
 
-    if (TransformTelescopeToCelestial(TDV, skyRA, skyDE))
+    if (TransformTelescopeToCelestialJD(TDV, skyRA, skyDE, ln_get_julian_from_sys()))
     {
         // double lst = get_local_sidereal_time(LocationNP[LOCATION_LONGITUDE].getValue());
         // double dHA = rangeHA(lst - skyRA);
@@ -710,7 +710,7 @@ bool AstroTrac::ReadScopeStatus()
 bool AstroTrac::getTelescopeFromSkyCoordinates(double ra, double de, INDI::IEquatorialCoordinates &telescopeCoordinates)
 {
     TelescopeDirectionVector TDV;
-    if (TransformCelestialToTelescope(ra, de, 0.0, TDV))
+    if (TransformCelestialToTelescopeJD(ra, de, ln_get_julian_from_sys(), TDV))
     {
         EquatorialCoordinatesFromTelescopeDirectionVector(TDV, telescopeCoordinates);
         LOGF_DEBUG("TransformCelestialToTelescope: RA=%lf DE=%lf, TDV (x :%lf, y: %lf, z: %lf), local hour RA %lf DEC %lf",

drivers/telescope/dsc.cpp

@@ -468,7 +468,7 @@ INDI::IEquatorialCoordinates DSC::TelescopeEquatorialToSky()
         eq.declination = encoderEquatorialCoordinates.declination;
         TDV    = TelescopeDirectionVectorFromLocalHourAngleDeclination(eq);
 
-        if (!TransformTelescopeToCelestial(TDV, RightAscension, Declination))
+        if (!TransformTelescopeToCelestialJD(TDV, RightAscension, Declination, ln_get_julian_from_sys()))
         {
             RightAscension = encoderEquatorialCoordinates.rightascension;
             Declination    = encoderEquatorialCoordinates.declination;
@@ -493,7 +493,7 @@ INDI::IEquatorialCoordinates DSC::TelescopeHorizontalToSky()
     TelescopeDirectionVector TDV = TelescopeDirectionVectorFromAltitudeAzimuth(encoderHorizontalCoordinates);
     double RightAscension, Declination;
 
-    if (!TransformTelescopeToCelestial(TDV, RightAscension, Declination))
+    if (!TransformTelescopeToCelestialJD(TDV, RightAscension, Declination, ln_get_julian_from_sys()))
     {
         INDI::IEquatorialCoordinates EquatorialCoordinates {0, 0};
         TelescopeDirectionVector RotatedTDV(TDV);

drivers/telescope/skywatcherAPIMount.cpp

@@ -537,7 +537,7 @@ bool SkywatcherAPIMount::Goto(double ra, double dec)
     // Transform Celestial to Telescope coordinates.
     // We have no good way to estimate how long will the mount takes to reach target (with deceleration,
     // and not just speed). So we will use iterative GOTO once the first GOTO is complete.
-    if (TransformCelestialToTelescope(ra, dec, 0.0, TDV))
+    if (TransformCelestialToTelescopeJD(ra, dec, ln_get_julian_from_sys(), TDV))
     {
         INDI::IEquatorialCoordinates EquatorialCoordinates { 0, 0 };
         AltitudeAzimuthFromTelescopeDirectionVector(TDV, AltAz);
@@ -909,7 +909,7 @@ bool SkywatcherAPIMount::getCurrentRADE(INDI::IHorizontalCoordinates altaz, INDI
     DEBUGF(INDI::AlignmentSubsystem::DBG_ALIGNMENT, "TDV x %lf y %lf z %lf", TDV.x, TDV.y, TDV.z);
 
     double RightAscension, Declination;
-    if (!TransformTelescopeToCelestial(TDV, RightAscension, Declination))
+    if (!TransformTelescopeToCelestialJD(TDV, RightAscension, Declination, ln_get_julian_from_sys()))
     {
         TelescopeDirectionVector RotatedTDV(TDV);
         switch (GetApproximateMountAlignment())
@@ -981,7 +981,7 @@ bool SkywatcherAPIMount::Sync(double ra, double dec)
         INDI::IHorizontalCoordinates AltAz { 0, 0 };
         TelescopeDirectionVector TDV;
 
-        if (TransformCelestialToTelescope(ra, dec, 0.0, TDV))
+        if (TransformCelestialToTelescopeJD(ra, dec, ln_get_julian_from_sys(), TDV))
         {
             AltitudeAzimuthFromTelescopeDirectionVector(TDV, AltAz);
             double OrigAlt = AltAz.altitude;
@@ -1345,10 +1345,11 @@ void SkywatcherAPIMount::ConvertGuideCorrection(double delta_ra, double delta_de
     TelescopeDirectionVector OldTDV;
     TelescopeDirectionVector NewTDV;
 
-    TransformCelestialToTelescope(m_SkyTrackingTarget.rightascension, m_SkyTrackingTarget.declination, 0.0, OldTDV);
+    TransformCelestialToTelescopeJD(m_SkyTrackingTarget.rightascension, m_SkyTrackingTarget.declination,
+                                    ln_get_julian_from_sys(), OldTDV);
     AltitudeAzimuthFromTelescopeDirectionVector(OldTDV, OldAltAz);
-    TransformCelestialToTelescope(m_SkyTrackingTarget.rightascension + delta_ra,
-                                  m_SkyTrackingTarget.declination + delta_dec, 0.0, NewTDV);
+    TransformCelestialToTelescopeJD(m_SkyTrackingTarget.rightascension + delta_ra,
+                                    m_SkyTrackingTarget.declination + delta_dec, ln_get_julian_from_sys(), NewTDV);
     AltitudeAzimuthFromTelescopeDirectionVector(NewTDV, NewAltAz);
     delta_alt = NewAltAz.altitude - OldAltAz.altitude;
     delta_az = NewAltAz.azimuth - OldAltAz.azimuth;
@@ -1674,7 +1675,7 @@ bool SkywatcherAPIMount::trackUsingPID()
     auto de = m_SkyTrackingTarget.declination + AxisOffsetNP[DEOffset].getValue();
     auto JDOffset = AxisOffsetNP[JulianOffset].getValue() / 86400.0;
 
-    if (TransformCelestialToTelescope(ra, de, JDOffset, TDV))
+    if (TransformCelestialToTelescopeJD(ra, de, ln_get_julian_from_sys() + JDOffset, TDV))
     {
         DEBUGF(INDI::AlignmentSubsystem::DBG_ALIGNMENT, "TDV x %lf y %lf z %lf", TDV.x, TDV.y, TDV.z);
         AltitudeAzimuthFromTelescopeDirectionVector(TDV, AltAz);
@@ -1871,23 +1872,23 @@ bool SkywatcherAPIMount::trackUsingPredictiveRates()
     }
 
     // Start by transforming tracking target celestial coordinates to telescope coordinates.
-    if (TransformCelestialToTelescope(m_SkyTrackingTarget.rightascension, m_SkyTrackingTarget.declination,
-                                      0, TDV))
+    double JDnow {ln_get_julian_from_sys()};
+    if (TransformCelestialToTelescopeJD(m_SkyTrackingTarget.rightascension, m_SkyTrackingTarget.declination,
+                                        JDnow, TDV))
     {
         // If mount is Alt-Az then that's all we need to do
         AltitudeAzimuthFromTelescopeDirectionVector(TDV, targetMountAxisCoordinates);
-        TransformCelestialToTelescope(m_SkyTrackingTarget.rightascension, m_SkyTrackingTarget.declination,
-                                      JDoffset, futureTDV);
+        TransformCelestialToTelescopeJD(m_SkyTrackingTarget.rightascension, m_SkyTrackingTarget.declination,
+                                        JDnow + JDoffset, futureTDV);
         AltitudeAzimuthFromTelescopeDirectionVector(futureTDV, futureMountAxisCoordinates);
-        TransformCelestialToTelescope(m_SkyTrackingTarget.rightascension, m_SkyTrackingTarget.declination,
-                                      -JDoffset, pastTDV);
+        TransformCelestialToTelescopeJD(m_SkyTrackingTarget.rightascension, m_SkyTrackingTarget.declination,
+                                        JDnow - JDoffset, pastTDV);
         AltitudeAzimuthFromTelescopeDirectionVector(pastTDV, pastMountAxisCoordinates);
 
     }
     // If transformation failed.
     else
     {
-        double JDnow {ln_get_julian_from_sys()};
         INDI::IEquatorialCoordinates EquatorialCoordinates { 0, 0 };
         EquatorialCoordinates.rightascension  = m_SkyTrackingTarget.rightascension;
         EquatorialCoordinates.declination = m_SkyTrackingTarget.declination;

drivers/telescope/telescope_simulator.cpp

@@ -317,7 +317,7 @@ void ScopeSim::updateCurrentCoordsFromAxes()
             INDI::IEquatorialCoordinates raCoords{ encoderRA, instDec.Degrees() };
             TelescopeDirectionVector tdv =
                 TelescopeDirectionVectorFromEquatorialCoordinates(raCoords);
-            corrected = TransformTelescopeToCelestial(tdv, corrRA, corrDec);
+            corrected = TransformTelescopeToCelestialJD(tdv, corrRA, corrDec, ln_get_julian_from_sys());
         }
         if (corrected)
         {
@@ -571,7 +571,7 @@ bool ScopeSim::Goto(double r, double d)
     if (GetAlignmentDatabase().size() >= 1)
     {
         TelescopeDirectionVector tdv;
-        if (TransformCelestialToTelescope(r, d, 0.0, tdv))
+        if (TransformCelestialToTelescopeJD(r, d, ln_get_julian_from_sys(), tdv))
         {
             // The TDV now encodes encoder RA (time-stable), so decode with
             // EquatorialCoordinatesFromTelescopeDirectionVector — no LST conversion needed.

drivers/telescope/temmadriver.cpp

@@ -419,7 +419,7 @@ bool TemmaMount::ReadScopeStatus()
 
         aligned = true;
 
-        if (!TransformTelescopeToCelestial(TDV, alignedRA, alignedDEC))
+        if (!TransformTelescopeToCelestialJD(TDV, alignedRA, alignedDEC, ln_get_julian_from_sys()))
         {
             aligned = false;
             DEBUGF(INDI::AlignmentSubsystem::DBG_ALIGNMENT,
@@ -938,7 +938,7 @@ INDI::IEquatorialCoordinates TemmaMount::TelescopeToSky(double ra, double dec)
         eq.dec = dec;
         TDV    = TelescopeDirectionVectorFromLocalHourAngleDeclination(eq);
 
-        if (TransformTelescopeToCelestial(TDV, RightAscension, Declination))
+        if (TransformTelescopeToCelestialJD(TDV, RightAscension, Declination, ln_get_julian_from_sys()))
         {
             //  if we get here, the conversion was successful
             //LOG_DEBUG"new values %6.4f %6.4f %6.4f  %6.4f Deltas %3.0lf %3.0lf\n",ra,dec,RightAscension,Declination,(ra-RightAscension)*60,(dec-Declination)*60);
@@ -977,7 +977,7 @@ INDI::IEquatorialCoordinates TemmaMount::SkyToTelescope(double ra, double dec)
         //  if the alignment system has been turned off
         //  this transformation will fail, and we fall thru
         //  to using raw co-ordinates from the mount
-        if (TransformCelestialToTelescope(ra, dec, 0.0, TDV))
+        if (TransformCelestialToTelescopeJD(ra, dec, ln_get_julian_from_sys(), TDV))
         {
             /*  Initial attempt, using RA/DEC co-ordinates talking to alignment system
             EquatorialCoordinatesFromTelescopeDirectionVector(TDV,eq);

examples/tutorial_seven/simple_telescope_simulator.cpp

@@ -102,7 +102,7 @@ bool ScopeSim::Goto(double ra, double dec)
     TelescopeDirectionVector TDV;
     INDI::IHorizontalCoordinates AltAz { 0, 0 };
 
-    if (TransformCelestialToTelescope(ra, dec, 0.0, TDV))
+    if (TransformCelestialToTelescopeJD(ra, dec, ln_get_julian_from_sys(), TDV))
     {
         // The alignment subsystem has successfully transformed my coordinate
         AltitudeAzimuthFromTelescopeDirectionVector(TDV, AltAz);
@@ -287,7 +287,7 @@ bool ScopeSim::ReadScopeStatus()
     INDI::IHorizontalCoordinates AltAz { CurrentEncoderMicrostepsRA / MICROSTEPS_PER_DEGREE, CurrentEncoderMicrostepsDEC / MICROSTEPS_PER_DEGREE };
     TelescopeDirectionVector TDV = TelescopeDirectionVectorFromAltitudeAzimuth(AltAz);
     double RightAscension, Declination;
-    if (!TransformTelescopeToCelestial(TDV, RightAscension, Declination))
+    if (!TransformTelescopeToCelestialJD(TDV, RightAscension, Declination, ln_get_julian_from_sys()))
     {
         if (TraceThisTick)
             DEBUG(DBG_SIMULATOR, "ReadScopeStatus - TransformTelescopeToCelestial failed");
@@ -613,8 +613,9 @@ void ScopeSim::TimerHit()
             TelescopeDirectionVector TDV;
             INDI::IHorizontalCoordinates AltAz { 0, 0 };
 
-            if (TransformCelestialToTelescope(CurrentTrackingTarget.rightascension, CurrentTrackingTarget.declination, JulianOffset,
-                                              TDV))
+            if (TransformCelestialToTelescopeJD(CurrentTrackingTarget.rightascension,
+                                                CurrentTrackingTarget.declination,
+                                                ln_get_julian_from_sys() + JulianOffset, TDV))
                 AltitudeAzimuthFromTelescopeDirectionVector(TDV, AltAz);
             else
             {

libs/alignment/AlignmentSubsystemForDrivers.cpp

@@ -65,7 +65,7 @@ void AlignmentSubsystemForDrivers::SaveAlignmentConfigProperties(FILE *fp)
 // Helper methods
 
 bool AlignmentSubsystemForDrivers::AddAlignmentEntryEquatorial(double actualRA, double actualDec, double mountRA,
-        double mountDec)
+        double mountDec, double JD)
 {
     IGeographicCoordinates location;
     if (!GetDatabaseReferencePosition(location))
@@ -77,7 +77,7 @@ bool AlignmentSubsystemForDrivers::AddAlignmentEntryEquatorial(double actualRA,
     AlignmentDatabaseEntry NewEntry;
     TelescopeDirectionVector TDV = TelescopeDirectionVectorFromEquatorialCoordinates(RaDec);
 
-    NewEntry.ObservationJulianDate = ln_get_julian_from_sys();
+    NewEntry.ObservationJulianDate = JD;
     NewEntry.RightAscension = actualRA;
     NewEntry.Declination = actualDec;
     NewEntry.TelescopeDirection = TDV;
@@ -98,7 +98,7 @@ bool AlignmentSubsystemForDrivers::AddAlignmentEntryEquatorial(double actualRA,
 }
 
 bool AlignmentSubsystemForDrivers::SkyToTelescopeEquatorial(double actualRA, double actualDec, double &mountRA,
-        double &mountDec)
+        double &mountDec, double JD)
 {
     INDI::IEquatorialCoordinates eq{0, 0};
     TelescopeDirectionVector TDV;
@@ -115,7 +115,7 @@ bool AlignmentSubsystemForDrivers::SkyToTelescopeEquatorial(double actualRA, dou
 
     if (GetAlignmentDatabase().size() >= 1)
     {
-        if (TransformCelestialToTelescope(actualRA, actualDec, 0.0, TDV))
+        if (TransformCelestialToTelescopeJD(actualRA, actualDec, JD, TDV))
         {
             EquatorialCoordinatesFromTelescopeDirectionVector(TDV, eq);
             //  and now we have to convert from lha back to RA
@@ -129,7 +129,7 @@ bool AlignmentSubsystemForDrivers::SkyToTelescopeEquatorial(double actualRA, dou
 }
 
 bool AlignmentSubsystemForDrivers::TelescopeEquatorialToSky(double mountRA, double mountDec, double &actualRA,
-        double &actualDec)
+        double &actualDec, double JD)
 {
     INDI::IEquatorialCoordinates eq{0, 0};
     IGeographicCoordinates location;
@@ -150,14 +150,14 @@ bool AlignmentSubsystemForDrivers::TelescopeEquatorialToSky(double mountRA, doub
         eq.declination = mountDec;
 
         TDV = TelescopeDirectionVectorFromEquatorialCoordinates(eq);
-        return TransformTelescopeToCelestial(TDV, actualRA, actualDec);
+        return TransformTelescopeToCelestialJD(TDV, actualRA, actualDec, JD);
     }
 
     return false;
 }
 
 bool AlignmentSubsystemForDrivers::AddAlignmentEntryAltAz(double actualRA, double actualDec, double mountAlt,
-        double mountAz)
+        double mountAz, double JD)
 {
     IGeographicCoordinates location;
     if (!GetDatabaseReferencePosition(location))
@@ -169,7 +169,7 @@ bool AlignmentSubsystemForDrivers::AddAlignmentEntryAltAz(double actualRA, doubl
     AlignmentDatabaseEntry NewEntry;
     TelescopeDirectionVector TDV = TelescopeDirectionVectorFromAltitudeAzimuth(AltAz);
 
-    NewEntry.ObservationJulianDate = ln_get_julian_from_sys();
+    NewEntry.ObservationJulianDate = JD;
     NewEntry.RightAscension = actualRA;
     NewEntry.Declination = actualDec;
     NewEntry.TelescopeDirection = TDV;
@@ -189,7 +189,8 @@ bool AlignmentSubsystemForDrivers::AddAlignmentEntryAltAz(double actualRA, doubl
     return false;
 }
 
-bool AlignmentSubsystemForDrivers::SkyToTelescopeAltAz(double actualRA, double actualDec, double &mountAlt, double &mountAz)
+bool AlignmentSubsystemForDrivers::SkyToTelescopeAltAz(double actualRA, double actualDec, double &mountAlt,
+        double &mountAz, double JD)
 {
     INDI::IHorizontalCoordinates altAz{0, 0};
     TelescopeDirectionVector TDV;
@@ -202,7 +203,7 @@ bool AlignmentSubsystemForDrivers::SkyToTelescopeAltAz(double actualRA, double a
 
     if (GetAlignmentDatabase().size() >= 1)
     {
-        if (TransformCelestialToTelescope(actualRA, actualDec, 0.0, TDV))
+        if (TransformCelestialToTelescopeJD(actualRA, actualDec, JD, TDV))
         {
             AltitudeAzimuthFromTelescopeDirectionVector(TDV, altAz);
             mountAz = range360(altAz.azimuth);
@@ -214,7 +215,8 @@ bool AlignmentSubsystemForDrivers::SkyToTelescopeAltAz(double actualRA, double a
     return false;
 }
 
-bool AlignmentSubsystemForDrivers::TelescopeAltAzToSky(double mountAlt, double mountAz, double &actualRa, double &actualDec)
+bool AlignmentSubsystemForDrivers::TelescopeAltAzToSky(double mountAlt, double mountAz, double &actualRa,
+        double &actualDec, double JD)
 {
     INDI::IHorizontalCoordinates altaz{0, 0};
     IGeographicCoordinates location;
@@ -230,7 +232,7 @@ bool AlignmentSubsystemForDrivers::TelescopeAltAzToSky(double mountAlt, double m
         altaz.azimuth  = range360(mountAz);
         altaz.altitude = range360(mountAlt);
         TDV = TelescopeDirectionVectorFromAltitudeAzimuth(altaz);
-        return TransformTelescopeToCelestial(TDV, actualRa, actualDec);
+        return TransformTelescopeToCelestialJD(TDV, actualRa, actualDec, JD);
     }
 
     return false;