Changeset 5674

Timestamp:

Dec 5, 2005, 10:49:30 AM (20 years ago)

Author:

gusciora

Message:

This is the first version of the astrometry objects code directly from IfA.

Location:

trunk/psModules/src/astrom

Files:

• Makefile.am (modified) (1 diff)
• pmAstrometry.c (modified) (14 diffs)
• pmAstrometryObjects.c (added)
• pmAstrometryObjects.h (added)

trunk/psModules/src/astrom/Makefile.am

@@ -3 +3 @@
 libpsmoduleastrom_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS)
 libpsmoduleastrom_la_LDFLAGS  = -release $(PACKAGE_VERSION)
-libpsmoduleastrom_la_SOURCES  = pmAstrometry.c
+libpsmoduleastrom_la_SOURCES  = \
+    pmAstrometry.c \
+    pmAstrometryObjects.c
 
 psmoduleincludedir = $(includedir)
 psmoduleinclude_HEADERS = \
-  pmAstrometry.h
+  pmAstrometry.h \
+  pmAstrometryObjects.h

trunk/psModules/src/astrom/pmAstrometry.c

@@ -10 +10 @@
 * XXX: We should review the extent of the warning messages on these functions
 * when the transformations are not successful.
-*
-*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-11-27 19:28:56 $
+* 
+* XXX: Should we implement non-linear cell->chip transforms?
+* 
+*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-12-05 20:49:30 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -23 +25 @@
 #include <math.h>
 #include "pslib.h"
-#include "psDB.h"
 #include "pmAstrometry.h"
 
@@ -34 +35 @@
 XXX: Macro this for speed.
  *****************************************************************************/
-static psS32 checkValidImageCoords(double x,
-                                   double y,
-                                   psImage* tmpImage)
+static psS32 checkValidImageCoords(
+    double x,
+    double y,
+    psImage* tmpImage)
 {
     PS_ASSERT_IMAGE_NON_NULL(tmpImage, 0);
@@ -51 +53 @@
 /******************************************************************************
  *****************************************************************************/
+#define PS_FREE_HIERARCHY 1
 static void readoutFree(pmReadout *readout)
 {
@@ -77 +80 @@
 }
 
-#define PS_FREE_HIERARCHY 1
 static void cellFree(pmCell *cell)
 {
@@ -255 +257 @@
 }
 
-bool cellCheckParents(pmCell *cell)
+static psBool cellCheckParents(pmCell *cell)
 {
     if (cell == NULL) {
@@ -273 +275 @@
 }
 
-bool chipCheckParents(pmChip *chip)
+static psBool chipCheckParents(pmChip *chip)
 {
     if (chip == NULL) {
@@ -293 +295 @@
 }
 
-bool pmFPACheckParents(pmFPA *fpa)
+psBool pmFPACheckParents(pmFPA *fpa)
 {
     if (fpa == NULL) {
@@ -617 +619 @@
 
 /*****************************************************************************
-XXX: What about units for the (x,y) coords?
- 
-XXX: This has not been tested.
- *****************************************************************************/
+  *****************************************************************************/
 psSphere* pmCoordTPToSky(
     psSphere* outSphere,
@@ -635 +634 @@
     return(rc);
 }
+
 /*****************************************************************************
-XXX: What about units for the (x,y) coords?
- 
-XXX: This has not been tested.
  *****************************************************************************/
 psPlane* pmCoordSkyToTP(
@@ -655 +652 @@
 }
 
-
-// XXX: Should we check return codes of intermediate transforms?
-// XXX: This has not been tested.
+/*****************************************************************************
+ *****************************************************************************/
 psSphere* pmCoordCellToSky(
     psSphere* skyCoord,
@@ -700 +696 @@
 }
 
+/*****************************************************************************
+ *****************************************************************************/
 psPlane* pmCoordSkyToCell(
     psPlane* cellCoord,
@@ -749 +747 @@
 }
 
-// XXX: This has not been tested.
-// XXX: Verify the plane coords to sphere coord code.
+/*****************************************************************************
+ *****************************************************************************/
 psSphere* pmCoordCellToSkyQuick(
     psSphere* outSphere,
@@ -778 +776 @@
 
 /*****************************************************************************
-XXX: What about units for the (x,y) coords?
- 
-XXX: This has not been tested.
- 
-XXX: Verify the plane coords to sphere coord code.
  *****************************************************************************/
 psPlane* pmCoordSkyToCellQuick(