Changeset 2061

Timestamp:

Oct 12, 2004, 11:10:41 AM (22 years ago)

Author:

desonia

Message:

added slaAirmas function for use in psExposureAlloc.

Location:

trunk/psLib/src/astronomy

Files:

• psAstrometry.c (modified) (2 diffs)
• slalib.h (modified) (9 diffs)

trunk/psLib/src/astronomy/psAstrometry.c

@@ -8 +8 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-12 20:53:02 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-12 21:10:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -312 +312 @@
     // XXX: how is these value derived?
     *(double *)&exp->lst = psTimeToLST((psTime*)time,observatory->longitude);
-    *(float *)&exp->positionAngle = 0.0f;
-    *(float *)&exp->parallacticAngle = 0.0f;
-    *(float *)&exp->airmass = 0.0f;
+    *(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->parallacticFactor = 0.0f;
     exp->cameraName = NULL;

trunk/psLib/src/astronomy/slalib.h

@@ -7 +7 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-12 19:10:00 $
+*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-12 21:10:41 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
 #define fslaAopqk _SLA_AOPQK__
 #define fslaOapqk _SLA_OAPQK__
+#define fslaAirmas _SLA_AIRMAS__
 #else
 #define fslaAoppa _sla_aoppa__
 #define fslaAopqk _sla_aopqk__
 #define fslaOapqk _sla_oapqk__
+#define fslaAirmas _sla_airmas__
 #endif
 #elif FORTRAN_NO_UNDERSCORE_SUFFIX
@@ -32 +34 @@
 #define fslaAopqk _SLA_AOPQK
 #define fslaOapqk _SLA_OAPQK
+#define fslaAirmas _SLA_AIRMAS
 #else
 #define fslaAoppa _sla_aoppa
 #define fslaAopqk _sla_aopqk
 #define fslaOapqk _sla_oapqk
+#define fslaAirmas _sla_airmas
 #endif
 #else
@@ -42 +46 @@
 #define fslaAopqk _SLA_AOPQK_
 #define fslaOapqk _SLA_OAPQK_
+#define fslaAirmas _SLA_AIRMAS_
 #else
 #define fslaAoppa _sla_aoppa_
 #define fslaAopqk _sla_aopqk_
 #define fslaOapqk _sla_oapqk_
+#define fslaAirmas _sla_airmas_
 #endif
 #endif
@@ -54 +60 @@
 #define fslaAopqk SLA_AOPQK__
 #define fslaOapqk SLA_OAPQK__
+#define fslaAirmas SLA_AIRMAS__
 #else
 #define fslaAoppa sla_aoppa__
 #define fslaAopqk sla_aopqk__
 #define fslaOapqk sla_oapqk__
+#define fslaAirmas sla_airmas__
 #endif
 #elif FORTRAN_NO_UNDERSCORE_SUFFIX
@@ -64 +72 @@
 #define fslaAopqk SLA_AOPQK
 #define fslaOapqk SLA_OAPQK
+#define fslaAirmas SLA_AIRMAS
 #else
 #define fslaAoppa sla_aoppa
 #define fslaAopqk sla_aopqk
 #define fslaOapqk sla_oapqk
+#define fslaAirmas sla_airmas
 #endif
 #else
@@ -74 +84 @@
 #define fslaAopqk SLA_AOPQK_
 #define fslaOapqk SLA_OAPQK_
+#define fslaAirmas SLA_AIRMAS_
 #else
 #define fslaAoppa sla_aoppa_
 #define fslaAopqk sla_aopqk_
 #define fslaOapqk sla_oapqk_
+#define fslaAirmas sla_airmas_
 #endif
 #endif
@@ -118 +130 @@
     );
 
+extern double fslaAirmas(
+        const double* zenithDistance
+    );
+
 /*
     void slaAoppa(date, dut, elongm, phim, hm, xp, yp, tdk, pmb, rh, wl, tlr, aoprms)
@@ -174 +190 @@
 fslaOapqk(TYPE, &OB1, &OB2, AOPRMS, RAP, DAP)
 
-#endif
+/*
+    double slaAirmas(zd)
+    
+    PARAMETERS
+    
+    double zd
+*/
+#define slaAirmas(ZD) fslaAirmas(&ZD)
+
+#endif