Changeset 219

Timestamp:

Mar 11, 2004, 11:20:33 AM (22 years ago)

Author:

Paul Price

Message:

Re-instituted psAstromCoeffs when I realised we need to have magnitude
and colour polynomials as well.

File:

• trunk/archive/pslib/include/psAstrom.h (modified) (2 diffs)

trunk/archive/pslib/include/psAstrom.h

@@ -14 +14 @@
 /* Include polynomial definitions */
 #include "psFunctions.h"
+
+/***********************************************************************************************************/
+
+/**
+ * Astrometry coefficients.
+ * These are composed of:
+ * (1) Coefficients in x and y --- a general spatial fit.
+ * (2) Coefficients in x and y for each polynomial order in magnitude, e.g. one set of coefficients in x and
+ * y for mag^1, another set of coefficients in x and y for mag^2.
+ * (3) Coefficients in x and y for each polynomial order in colour.
+ */
+typedef struct {
+    psDPolynomial2D *restrict ra, dec;  //!< Spatial coefficients, i.e. x and y
+    int magOrder;                       //!< Order of polynomial in magnitude
+    psDPolynomial2D *restrict raMag, decMag; //!< An ARRAY of polynomials for each polynomial order in
+                                             //!< magnitude
+    int colorOrder;                     //!< Order of polynomial in colour
+    psDPolynomial2D *restrict raCol, decCol; //!< An ARRAY of polynomials for each polynomial order in colour
+    enum psColorRef colorRef;           //!< Colour reference
+} psAstromCoeffs;
+
 
 /***********************************************************************************************************/
@@ -148 +169 @@
 typedef struct {
     /* Focal plane to and from tangent plane */
-    psDPolynomial2D *restrict tpToFP;   //!< General astrometric solution for tangent plane to focal plane
-    psDPolynomial2D *restrict fpToTP;   //!< General astrometric solution for focal plane to tangent plane
-    enum psColorRef colorRef;           //!< Colour reference
+    psAstromCoeffs *restrict tpToFP;    //!< General astrometric solution for tangent plane to focal plane
+    psAstromCoeffs *restrict fpToTP;    //!< General astrometric solution for focal plane to tangent plane
     psMatrix *pattern;                  //!< Fixed pattern distortions for focal plane to tangent plane (simply
                                         //!< * -1 for the reverse); MAY NEED TO BE REVISED UPON IMPLEMENTATION