Changeset 21363 for trunk/psModules/src/objects/pmSourcePhotometry.c

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/pmSourcePhotometry.c (modified) (10 diffs)

trunk/psModules/src/objects/pmSourcePhotometry.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-01-27 06:39:38 $
+ *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-06 02:31:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -446 +446 @@
     assert (Pj != NULL);
 
-    const psImage *Wi = Mi->weight;
+    const psImage *Wi = Mi->variance;
     if (!unweighted_sum) {
         assert (Wi != NULL);
@@ -511 +511 @@
     assert (Pj != NULL);
 
-    const psImage *Wi = Mi->weight;
+    const psImage *Wi = Mi->variance;
     if (!unweighted_sum) {
         assert (Wi != NULL);
@@ -567 +567 @@
     const psImage *Pi = Mi->pixels;
     assert (Pi != NULL);
-    const psImage *Wi = Mi->weight;
+    const psImage *Wi = Mi->variance;
     if (!unweighted_sum) {
         assert (Wi != NULL);
@@ -612 +612 @@
 # endif
 
-bool pmSourceChisq (pmModel *model, psImage *image, psImage *mask, psImage *weight,
+bool pmSourceChisq (pmModel *model, psImage *image, psImage *mask, psImage *variance,
                     psImageMaskType maskVal)
 {
@@ -618 +618 @@
     PS_ASSERT_PTR_NON_NULL(image, false);
     PS_ASSERT_PTR_NON_NULL(mask, false);
-    PS_ASSERT_PTR_NON_NULL(weight, false);
+    PS_ASSERT_PTR_NON_NULL(variance, false);
 
     double dC = 0.0;
@@ -626 +626 @@
             if (mask->data.PS_TYPE_IMAGE_MASK_DATA[j][i] & maskVal)
                 continue;
-            if (weight->data.F32[j][i] <= 0)
-                continue;
-            dC += PS_SQR (image->data.F32[j][i]) / weight->data.F32[j][i];
+            if (variance->data.F32[j][i] <= 0)
+                continue;
+            dC += PS_SQR (image->data.F32[j][i]) / variance->data.F32[j][i];
             Npix ++;
         }
@@ -648 +648 @@
     const psImage *Pi = Mi->modelFlux;
     assert (Pi != NULL);
-    const psImage *Wi = Mi->weight;
+    const psImage *Wi = Mi->variance;
     if (!unweighted_sum) {
         assert (Wi != NULL);
@@ -706 +706 @@
     assert (Pj != NULL);
 
-    const psImage *Wi = Mi->weight;
+    const psImage *Wi = Mi->variance;
     if (!unweighted_sum) {
         assert (Wi != NULL);
@@ -770 +770 @@
     assert (Pj != NULL);
 
-    const psImage *Wi = Mi->weight;
+    const psImage *Wi = Mi->variance;
     if (!unweighted_sum) {
         assert (Wi != NULL);