Changeset 4143 for trunk/psLib/src/astronomy/psAstrometry.c

Timestamp:

Jun 7, 2005, 2:26:01 PM (21 years ago)

Author:

desonia

Message:

removed SLALIB functions.

File:

• trunk/psLib/src/astronomy/psAstrometry.c (modified) (7 diffs)

trunk/psLib/src/astronomy/psAstrometry.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-31 21:47:46 $
+ *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 00:26:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -29 +29 @@
 #include "psTrace.h"
 #include "psLogMsg.h"
-
-#include "slalib.h"
 
 /*****************************************************************************
@@ -233 +231 @@
     *(float *)&exp->positionAngle = 0.0f; // XXX: need input, see Bug #207
     *(float *)&exp->parallacticAngle = 0.0f; // XXX: need input, see Bug #207
-    *(float *)&exp->airmass = slaAirmas(zenithDistance);
+    *(float *)&exp->airmass = 0.0f; // XXX: needs calculation!  = slaAirmas(zenithDistance);
     *(float *)&exp->parallacticFactor = 0.0f;
     exp->cameraName = NULL;
@@ -408 +406 @@
     PS_ASSERT_PTR_NON_NULL(exp, NULL);
 
-    double date = psTimeToMJD(exp->time);
-    double dut = psTimeGetUT1Delta(exp->time,PS_IERS_A);
-    double elongm = exp->observatory->longitude;
-    double phim = exp->observatory->latitude;
-    double hm = exp->observatory->height;
-
     psSphere* polarMotion = p_psTimeGetPoleCoords(exp->time);
-    double xp = polarMotion->r;
-    double yp = polarMotion->d;
+
+    psGrommit* grommit = (psGrommit* ) psAlloc(sizeof(psGrommit));
+
+    *(double*)&grommit->latitude = exp->observatory->latitude;
+    *(double*)&grommit->longitude = exp->observatory->longitude;
+    *(double*)&grommit->height = exp->observatory->height;
+    *(double*)&grommit->abberationMag = 0.0; // XXX: need to figure out what to set here.
+    *(double*)&grommit->temperature = exp->temperature;
+    *(double*)&grommit->pressure = exp->pressure;
+    *(double*)&grommit->humidity = exp->humidity;
+    *(double*)&grommit->wavelength = exp->wavelength;
+    *(double*)&grommit->lapseRate = exp->observatory->tlr;
+    *(double*)&grommit->refractA = polarMotion->r; // XXX: need to figure out what to set here too.
+    *(double*)&grommit->refractB = polarMotion->d; // XXX: need to figure out what to set here too.
+    *(double*)&grommit->siderealTime = psTimeToMJD(exp->time); // XXX: this is probably not correct
+
     psFree(polarMotion);
-
-    double tdk = exp->temperature;
-    double pmb = exp->pressure;
-    double rh = exp->humidity;
-    double wl = exp->wavelength;
-    double tlr = exp->observatory->tlr;
-
-    psGrommit* grommit = (psGrommit* ) psAlloc(sizeof(psGrommit));
-
-    slaAoppa(date, dut, elongm, phim, hm, xp, yp,
-             tdk, pmb, rh, wl, tlr, (double*)grommit);
 
     return (grommit);
@@ -579 +574 @@
     PS_ASSERT_PTR_NON_NULL(grommit, NULL);
 
-    double AOB = 0.0;
-    double ZOB = 0.0;
-    double HOB = 0.0;
     if (outSphere == NULL) {
         outSphere = (psSphere* ) psAlloc(sizeof(psSphere));
     }
 
-    slaAopqk(tpCoord->x, tpCoord->y, (double*)grommit,
-             &AOB, &ZOB, &HOB, &outSphere->r, &outSphere->d);
+    // XXX: this was done by a SLALIB call -- needs to be reimplemented
+    psWarning("Warning!  psCoordTPToSky functionality is no longer implemented");
+    /* slaAopqk(tpCoord->x, tpCoord->y, (double*)grommit,
+             &AOB, &ZOB, &HOB, &outSphere->r, &outSphere->d); */
 
     return (outSphere);
@@ -693 +687 @@
     PS_ASSERT_PTR_NON_NULL(grommit, NULL);
 
-    char* type = "RA";
+    // char* type = "RA";
 
     if (tpCoord == NULL) {
@@ -699 +693 @@
     }
 
-    slaOapqk(type, in->r, in->d, (double*)grommit, &tpCoord->x, &tpCoord->y);
+    // XXX: this was done by a SLALIB call -- needs to be reimplemented
+    psWarning("Warning!  psCoordSkyToTP functionality is no longer implemented");
+    /* slaOapqk(type, in->r, in->d, (double*)grommit, &tpCoord->x, &tpCoord->y); */
 
     return(tpCoord);