Changeset 7152

Timestamp:

May 19, 2006, 5:39:53 AM (20 years ago)

Author:

magnier

Message:

added distortion gradient fitting functions, split from pmAstrometryObjects

Location:

trunk/psModules/src

Files:

• astrom/Makefile.am (modified) (1 diff)
• astrom/pmAstrometryDistortion.c (added)
• astrom/pmAstrometryDistortion.h (added)
• astrom/pmAstrometryObjects.c (modified) (2 diffs)
• astrom/pmAstrometryObjects.h (modified) (4 diffs)
• psmodules.h (modified) (1 diff)

trunk/psModules/src/astrom/Makefile.am

@@ -4 +4 @@
 libpsmoduleastrom_la_LDFLAGS  = -release $(PACKAGE_VERSION)
 libpsmoduleastrom_la_SOURCES  = \
-        pmAstrometryObjects.c
-
-#       pmFPAAstrometry.c
+        pmAstrometryObjects.c \
+        pmAstrometryDistortion.c
 
 psmoduleincludedir = $(includedir)
 psmoduleinclude_HEADERS = \
-        pmAstrometryObjects.h
-
-#       pmFPAAstrometry.h
+        pmAstrometryObjects.h \
+        pmAstrometryDistortion.h

trunk/psModules/src/astrom/pmAstrometryObjects.c

@@ -8 +8 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-04-30 22:03:58 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-05-19 15:39:53 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -17 +17 @@
 /*  INCLUDE FILES                                                             */
 /******************************************************************************/
+#include <stdio.h>
 #include <string.h>
 #include <math.h>
+#include <unistd.h>   // for unlink
 #include "pslib.h"
 #include "psVectorSmooth.h"

trunk/psModules/src/astrom/pmAstrometryObjects.h

@@ -8 +8 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-04-30 22:03:58 $
+*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-05-19 15:39:53 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
 */
 
-#if !defined(PM_ASTROMETRYOBJECTS_H)
-#define PM_PM_ASTROMETRYOBJECTS_H_H
-
-# include <stdio.h>
-# include <strings.h>  // for strcasecmp
-# include <unistd.h>   // for unlink
-# include <pslib.h>
-# include <pmFPA.h>
+#ifndef PM_ASTROMETRY_OBJECTS_H
+#define PM_ASTROMETRY_OBJECTS_H
 
 /*
@@ -46 +40 @@
     psPlane *FP;   ///< the position in the pmFPA frame
     psPlane *TP;   ///< the position in the tangent plane
-    psSphere *sky;   ///< the position on the Celestial Sphere.
+    psSphere *sky;        ///< the position on the Celestial Sphere.
     double Mag;                         ///< object magnitude XXX what filter?
     double dMag;                        ///< error on object magnitude
@@ -255 +249 @@
 
 
-/*
- *
- * The following function determines the position residual, in the tangent
- * plane, as a function of position in the focal plane, for a collection of raw
- * measurements and matched reference stars. The configuration data must include
- * the bin size over which the gradient is measured (keyword: ASTROM.GRAD.BOX).
- * The function returns an array of pmAstromGradient structures, defined below.
- *
- * XXX: No prototype code.
- *
- */
-psArray pmAstromMeasureGradients(
-    psArray *starlist1,
-    psArray *starlist2,
-    psArray *match,
-    psMetadata *config
-);
-
-
-
-/*
- *
- * The following data structure carries the information about the residual
- * gradient of source positions in the tangent plane (pmAstromObj.TP) as a
- * function of position in the focal plane (pmAstromObj.FP).
- *
- */
-typedef struct
-{
-    psPlane FP;
-    psPlane dTPdL;
-    psPlane dTPdM;
-}
-pmAstromGradient;
-
-
-/*
- *
- * The gradient set measured above can be fitted with a pair of 2D
- * polynomials. The resulting fits can then be related back to the implied
- * polynomials which represent the distortion. The following function performs
- * the fit and applies the result to the distortion transformation of the
- * supplied pmFPA structure. The configuration variable supplies the polynomial
- * order (keyword: ASTROM.DISTORT.ORDER).
- *
- * XXX: No prototype code.
- *
- */
-psArray pmAstromFitDistortion(
-    pmFPA *fpa,
-    psArray *gradients,
-    psMetadata *config);
-
-
-
-
-
 /*******************************************************************************
  The following functions and structs were in the prototype code, but not the
@@ -394 +331 @@
 );
 
-#endif
-
+#endif // PM_ASTROMETRY_OBJECTS_H

trunk/psModules/src/psmodules.h

@@ -41 +41 @@
 #include <pmFPA_JPEG.h>
 #include <pmReadout.h>
+#include <pmChipMosaic.h>
 
 // the following headers are from psModule:astrom
 #include <pmAstrometryObjects.h>
-#include <pmChipMosaic.h>
+#include <pmAstrometryDistortion.h>
 
 // the following headers are from psModule:detrend