Changeset 21368 for trunk/pswarp/src/pswarp.h

Timestamp:

Feb 5, 2009, 5:10:36 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

• trunk/pswarp/src/pswarp.h (modified) (4 diffs)

trunk/pswarp/src/pswarp.h

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-05 20:44:04 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-06 03:10:36 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
@@ -31 +31 @@
 #define PSWARP_ANALYSIS_VARFACTOR "PSWARP.VARFACTOR" ///< Name for variance factor in analysis metadata
 #define PSWARP_ANALYSIS_GOODPIX   "PSWARP.GOODPIX" ///< Name for number of good pixels in analysis metadata
+#define PSWARP_ANALYSIS_COVARIANCES "PSWARP.COVARIANCES" ///< Name for covariance matrices on analysis MD
 
 /**
@@ -43 +44 @@
 } pswarpMap;
 
-/* the pswarpMapGrid carries a collection of pswarpMag structures representing 
+/* the pswarpMapGrid carries a collection of pswarpMag structures representing
  * the local value of the pswarpMap at different locations in the image.
  */
@@ -66 +67 @@
 
     /** output values for this tile */
-    long goodPixels;                    //< Number of good pixels
-    int xMin, xMax, yMin, yMax;         //< Bounds of tile
+    long goodPixels;                    ///< Number of good pixels
+    int xMin, xMax, yMin, yMax;         ///< Bounds of tile
+    psKernel *covariance;               ///< Covariance matrix
 } pswarpTransformTileArgs;