Changeset 214

Timestamp:

Mar 11, 2004, 10:00:17 AM (22 years ago)

Author:

Paul Price

Message:

Fixed psAstromCoeffs to contain coefficients, errors and a mask that
turns coefficients on and off after consultation with Dave Monet:

"Having a fixed sequence of terms and a vector of bits that
disable/enable fitting these is fine. I look enviously at the amazing
generality of many of the other modules, but I can easily live with
astrometry having a relatively fixed environment. The sequencing of
the first 12 can be done now:

const, x, y, x*x, x*y, y*y, x*x*x, x*x*y, x*y*y, y*y*y, mag, color"

File:

• trunk/archive/pslib/include/psAstrom.h (modified) (1 diff)

trunk/archive/pslib/include/psAstrom.h

@@ -13 +13 @@
 
 
-/***********************************************************************************************************/
-
-/** Astrometric coefficients */
-typedef struct {
-    int xyOrder;                        //!< Spatial (x,y) order of polynomial
-    int colourOrder;                    //!< Order of polynomial in colour
-    int magOrder;                       //!< Order of polynomial in magnitude
-    int xyColourOrder;                  //!< Spatial (x,y) order of polynomial in colour times x and y
-    int xyMagOrder;                     //!< Spatial (x,y) order of polynomial in magnitude times x and y
-    psColourRef colourRef;              //!< Colour reference
+
+/***********************************************************************************************************/
+
+/** Astrometric coefficients.
+ * First twelve coefficients are: const, x, y, x*x, x*y, y*y, x*x*x, x*x*y, x*y*y, y*y*y, mag, color
+ */
+typedef struct {
     psDoubleArray *restrict coeff;      //!< Coefficients of astrometric solution
     psDoubleArray *restrict coeffErr;   //!< Error in coefficients
     psBitMask *restrict coeffMask;      //!< Use this coefficient?
+    psColourRef colourRef;              //!< Colour reference
 } psAstromCoeffs;
 
 /** Constructor */
 psAstromCoeffs *
-psAstromCoeffsAlloc(int xyOrder,        //!< Spatial (x,y) order of polynomial
-                    int colourOrder,    //!< Order of polynomial in colour
-                    int magOrder,       //!< Order of polynomial in magnitude
-                    int xyColourOrder,  //!< Spatial (x,y) order of polynomial in colour times x and y
-                    int xyMagOrder,     //!< Spatial (x,y) order of polynomial in magnitude times x and y
-                    psColourRef colourRef //!< Colour reference
-    );
+psAstromCoeffsAlloc(void);
 
 /** Destructor */