Changeset 30763 for branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

Feb 28, 2011, 2:44:39 PM (15 years ago)

Author:

eugene

Message:

unified function to generate output parameters for output cmf files; add chisqNorm calculation to pmSourceChisq, pass in nParams; re-calculate the chisq if we use constant weights; make sure we correctly set nDOF = nPoints - nParams

File:

• branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourcePhotometry.c (modified) (3 diffs)

branches/eam_branches/ipp-20110213/psModules/src/objects/pmSourcePhotometry.c

@@ -422 +422 @@
     *pixWeightNotPoor = notPoorSum / modelSum;
 
+    if (false && isfinite(*pixWeightNotBad) && isfinite(*pixWeightNotPoor)) {
+        psAssert (*pixWeightNotBad <= *pixWeightNotPoor, "error: all bad pixels should also be poor");
+    }
+
     return (true);
 }
@@ -674 +678 @@
 
 // determine chisq, etc for linear normalization-only fit
-bool pmSourceChisq (pmModel *model, psImage *image, psImage *mask, psImage *variance, psImageMaskType maskVal, const float covarFactor)
+bool pmSourceChisq (pmModel *model, psImage *image, psImage *mask, psImage *variance, psImageMaskType maskVal, const float covarFactor, int nParams)
 {
     PS_ASSERT_PTR_NON_NULL(model, false);
@@ -689 +693 @@
             if (variance->data.F32[j][i] <= 0)
                 continue;
-            dC += PS_SQR (image->data.F32[j][i]) / (covarFactor * variance->data.F32[j][i]);
+            // dC += PS_SQR (image->data.F32[j][i]) / (covarFactor * variance->data.F32[j][i]);
+            dC += PS_SQR (image->data.F32[j][i]) / variance->data.F32[j][i];
             Npix ++;
         }
     }
+
     model->nPix = Npix;
-    model->nDOF = Npix - 1;
+    model->nDOF = Npix - nParams - 1;
     model->chisq = dC;
+    model->chisqNorm = dC / model->nDOF;
 
     return (true);