Changeset 21363 for trunk/psModules/src/objects/pmResiduals.h

Timestamp:

Feb 5, 2009, 4:31:25 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/psModules/src/objects/pmResiduals.h (modified) (4 diffs)

trunk/psModules/src/objects/pmResiduals.h

@@ -4 +4 @@
  *
  * @author EAM, IfA
- * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- * @date $Date: 2009-01-27 06:39:38 $
+ * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2009-02-06 02:31:25 $
  * Copyright 2004 IfA, University of Hawaii
  */
@@ -14 +14 @@
 /// @{
 
-/** residual tables for sources 
+/** residual tables for sources
  */
 typedef struct {
@@ -20 +20 @@
     psImage *Rx;
     psImage *Ry;
-    psImage *weight;
+    psImage *variance;
     psImage *mask;
     int xBin;
@@ -31 +31 @@
 bool psMemCheckResiduals(psPtr ptr);
 
-// macros to abstract the resid mask type : these values must be consistent 
+// macros to abstract the resid mask type : these values must be consistent
 #define PM_TYPE_RESID_MASK PS_TYPE_U8        /**< the psElemType to use for mask image */
 #define PM_TYPE_RESID_MASK_DATA U8           /**< the data member to use for mask image */