Index: trunk/psLib/src/astronomy/psAstrometry.h
===================================================================
--- trunk/psLib/src/astronomy/psAstrometry.h	(revision 1981)
+++ trunk/psLib/src/astronomy/psAstrometry.h	(revision 2001)
@@ -8,6 +8,6 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-06 21:30:14 $
+*  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-07 19:16:46 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -184,4 +184,19 @@
 psFPA;
 
+/** Observatory Information
+ *
+ *  A container for the observatory data that doesn't change per exposure.
+ *
+ */
+typedef struct
+{
+    const char* name;                  ///< Name of observatory
+    const double latitude;             ///< Latitude of observatory, east positive
+    const double longitude;            ///< Longitude of observatory
+    const double height;               ///< Height of observatory
+    const double tlr;                  ///< Tropospheric Lapse Rate
+}
+psObservatory;
+
 /** Exposure Information
  *
@@ -196,8 +211,7 @@
     const double dec;                  ///< Telescope boresight, declination
     const double hourAngle;            ///< Hour angle
-    const double zenith;               ///< Zenith distance
+    const double zenithDistance;       ///< Zenith distance
     const double azimuth;              ///< Azimuth
-    const double localTime;            ///< Local Sidereal Time
-    const float date;                  ///< Modified Jullian Date of observation
+    const psTime* time;                ///< Time of observation
     const float rotAngle;              ///< Rotator position angle
     const float temperature;           ///< Air temperature, for estimating refraction
@@ -205,31 +219,17 @@
     const float humidity;              ///< Relative humidity, for refraction
     const float exposureTime;          ///< Exposure time
-    const double wavelength;           ///< Wavelength
+    const float wavelength;            ///< Wavelength
+    const psObservatory* observatory;  ///< Observatory data
 
     /* Derived quantities */
+    const double lst;                  ///< Local Sidereal Time
     const float positionAngle;         ///< Position angle
     const float parallacticAngle;      ///< Parallactic angle
     const float airmass;               ///< Airmass, calculated from zenith distance
     const float parallacticFactor;     ///< Parallactic factor
-    const char *cameraName;            ///< name of camera which provided exposure
-    const char *telescopeName;         ///< name of telescope which provided exposure
+    const char* cameraName;            ///< name of camera which provided exposure
+    const char* telescopeName;         ///< name of telescope which provided exposure
 }
 psExposure;
-
-/** Observatory Information
- *
- *  A container for the observatory data that doesn't change per exposure.
- *
- */
-typedef struct
-{
-    const char* name;                  ///< Name of observatory
-    const double latitude;             ///< Latitude of observatory, east positive
-    const double longitude;            ///< Longitude of observatory
-    const double height;               ///< Height of observatory
-    const double tlr;                  ///< Tropospheric Lapse Rate
-}
-psObservatory;
-
 
 /** Allocator for psFixedPattern struct
@@ -262,13 +262,14 @@
     double dec,                        ///< Telescope boresight, declination
     double hourAngle,                  ///< Hour angle
-    double zenith,                     ///< Zenith distance
+    double zenithDistance,             ///< Zenith distance
     double azimuth,                    ///< Azimuth
-    double localTime,                  ///< Local Sidereal Time
-    float date,                        ///< MJD
+    const psTime* time,                ///< time of observation
     float rotAngle,                    ///< Rotator position angle
     float temperature,                 ///< Temperature
     float pressure,                    ///< Pressure
     float humidity,                    ///< Relative humidity
-    float exposureTime                 ///< Exposure time
+    float exposureTime,                ///< Exposure time
+    float wavelength,                  ///< wavelength
+    const psObservatory* observatory   ///< Observatory data
 );