Changeset 1510

Timestamp:

Aug 11, 2004, 5:11:45 PM (22 years ago)

Author:

gusciora

Message:

Added color/magnitude arguments.

Location:

trunk/psLib/src/astronomy

Files:

• psAstrometry.c (modified) (8 diffs)
• psAstrometry.h (modified) (5 diffs)

trunk/psLib/src/astronomy/psAstrometry.c

@@ -8 +8 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-12 01:32:21 $
+*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-12 03:11:45 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -230 +230 @@
 }
 
-/*****************************************************************************
-XXX: must determine the correct values for XXX_Mag and XXX_Col;
- *****************************************************************************/
 psPlane* psCoordFPAToTP(psPlane* outCoord,
                         const psPlane* inCoord,
+                        double color,
+                        double magnitude,
                         const psFPA* fpa)
 {
-    float XXX_Mag = 0.0;
-    float XXX_Col = 0.0;
-
     return(psPlaneDistortApply(outCoord, fpa->toTangentPlane, inCoord,
-                               XXX_Mag, XXX_Col));
+                               magnitude, color));
 }
 
@@ -272 +268 @@
 /*****************************************************************************
 XXX: determine the grommit from the FPA associated with this chip.
-XXX: must determine the correct values for XXX_Mag and XXX_Col;
  *****************************************************************************/
 psSphere* psCoordCellToSky(psSphere* skyCoord,
                            const psPlane* cellCoord,
+                           double color,
+                           double magnitude,
                            const psCell* cell)
 {
@@ -282 +279 @@
     psFPA* parFPA = (cell->parent)->parent;
     psGrommit* tmpGrommit = NULL;
-    float XXX_Mag = 0.0;
-    float XXX_Col = 0.0;
 
     // Convert the input cell coordinates to FPA coordinates.
@@ -289 +284 @@
 
     // Convert the FPA coordinates to tangent plane Coordinates.
-    tpCoord = psPlaneDistortApply(tpCoord, parFPA->toTangentPlane, fpaCoord, XXX_Mag, XXX_Col);
+    tpCoord = psPlaneDistortApply(tpCoord, parFPA->toTangentPlane, fpaCoord, magnitude, color);
 
     // Generate a grommit for this FPA.
@@ -366 +361 @@
 
 
-/*****************************************************************************
-XXX: must determine the correct values for XXX_Mag and XXX_Col;
- *****************************************************************************/
 psPlane* psCoordTPToFPA(psPlane* fpaCoord,
                         const psPlane* tpCoord,
+                        double color,
+                        double magnitude,
                         const psFPA* fpa)
 {
-    float XXX_Mag = 0.0;
-    float XXX_Col = 0.0;
-
     return (psPlaneDistortApply(fpaCoord, fpa->fromTangentPlane,
-                                tpCoord, XXX_Mag, XXX_Col));
+                                tpCoord, magnitude, color));
 }
 
@@ -407 +398 @@
 psPlane* psCoordSkyToCell(psPlane* cellCoord,
                           const psSphere* skyCoord,
+                          double color,
+                          double magnitude,
                           const psCell* cell)
 {
@@ -417 +410 @@
 
     // Convert the tangent plane coords to FPA coords.
-    psPlane *fpaCoord = psCoordTPToFPA(fpaCoord, tpCoord, whichFPA);
+    psPlane *fpaCoord = psCoordTPToFPA(fpaCoord, tpCoord, color,
+                                       magnitude, whichFPA);
 
     // Convert the FPA coords to chip coords.

trunk/psLib/src/astronomy/psAstrometry.h

@@ -8 +8 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-12 01:23:20 $
+*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-12 03:11:45 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -309 +309 @@
     psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
     const psPlane* in,                 ///< the coordinate within FPA
+    double color,                      ///< Color of source
+    double magnitude,                  ///< Magnitude of source
     const psFPA* fpa                   ///< the FPA in interest
 );
@@ -339 +341 @@
     psSphere* out,                     ///< a sphere struct to recycle. If NULL, a new struct is created
     const psPlane* in,                 ///< the coordinate within cell
+    double color,                      ///< Color of source
+    double magnitude,                  ///< Magnitude of source
     const psCell* cell                 ///< the cell in interest
 );
@@ -370 +374 @@
     psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
     const psPlane* in,                 ///< the coordinate within tangent plane
+    double color,                      ///< Color of source
+    double magnitude,                  ///< Magnitude of source
     const psFPA* fpa                   ///< the FPA of interest
 );
@@ -400 +406 @@
     psPlane* out,                      ///< a plane struct to recycle. If NULL, a new struct is created
     const psSphere* in,                ///< the Sky coordinate
+    double color,                      ///< Color of source
+    double magnitude,                  ///< Magnitude of source
     const psCell* cell                 ///< the cell of interest
 );