Changeset 31153 for trunk/psModules/src/objects/pmSourceFitPCM.c

Timestamp:

Apr 4, 2011, 1:04:41 PM (15 years ago)

Author:

eugene

Message:

updates to pmPeak to better distinguish peak flux versions; updates to visualization; add bits for substantial suspect masking; consolidate assignment of source position and flux based on peak, moments, etc; improve footprint culling process; fix PSF_QF and PSF_QF_PERFECT calculations; fix source model chisq values

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmSourceFitPCM.c (modified) (3 diffs)

trunk/psModules

@@ -28 +28 @@
 ChangeLog
 psmodules-*.tar.*
+a.out.dSYM

@@ -28 +28 @@
 ChangeLog
 psmodules-*.tar.*
+a.out.dSYM

trunk/psModules/src/objects/pmSourceFitPCM.c

@@ -38 +38 @@
 #include "pmSourceDiffStats.h"
 #include "pmSource.h"
+#include "pmSourcePhotometry.h"
 #include "pmSourceFitModel.h"
 #include "pmPCMdata.h"
@@ -70 +71 @@
         psTrace ("psModules.objects", 4, "%f +/- %f", params->data.F32[i], dparams->data.F32[i]);
     }
+    if (fitOptions->saveCovariance) {
+        psFree(pcm->modelConv->covar);
+        pcm->modelConv->covar = psMemIncrRefCounter(covar);
+    }
     psTrace ("psphot", 4, "niter: %d, chisq: %f", myMin->iter, myMin->value);
 
@@ -79 +84 @@
         }
     }
+    pcm->modelConv->nIter = myMin->iter;
+    pcm->modelConv->nPar = pcm->nPar;
 
     // save the resulting chisq, nDOF, nIter
-    pcm->modelConv->chisq = myMin->value;
-    pcm->modelConv->nIter = myMin->iter;
-    pcm->modelConv->nPix = pcm->nPix;
-    pcm->modelConv->nDOF = pcm->nDOF;
-    pcm->modelConv->chisqNorm = pcm->modelConv->chisq / pcm->modelConv->nDOF;
+    if (fitOptions->poissonErrors) {
+        pcm->modelConv->chisq = myMin->value;
+        pcm->modelConv->nPix = pcm->nPix;
+        pcm->modelConv->nDOF = pcm->nDOF;
+        pcm->modelConv->chisqNorm = pcm->modelConv->chisq / pcm->modelConv->nDOF;
+    } else {
+        // xxx this is wrong because it does not convolve with the psf
+        pmSourceChisqUnsubtracted (source, pcm->modelConv, maskVal);
+    }
+
+    // set the model success or failure status
     pcm->modelConv->flags |= PM_MODEL_STATUS_FITTED;
     if (!fitStatus) pcm->modelConv->flags |= PM_MODEL_STATUS_NONCONVERGE;

@@ -28 +28 @@
 ChangeLog
 psmodules-*.tar.*
+a.out.dSYM