Changeset 31926 for branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceFitPCM.c

Timestamp:

Jul 22, 2011, 5:08:37 PM (15 years ago)

Author:

eugene

Message:

allow pcm fitting with a 1d gauss instead of full convolution

File:

• branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceFitPCM.c (modified) (5 diffs)

branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceFitPCM.c

@@ -50 +50 @@
 bool pmSourceFitPCM (pmPCMdata *pcm, pmSource *source, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal, int psfSize) {
     
+    psTimerStart ("pmSourceFitPCM");
+
     psVector *params  = pcm->modelConv->params;
     psVector *dparams  = pcm->modelConv->dparams;
@@ -64 +66 @@
     psImage *covar = psImageAlloc (params->n, params->n, PS_TYPE_F32);
 
+    float t1 = psTimerMark ("pmSourceFitPCM");
+
     bool fitStatus = pmPCM_MinimizeChisq (myMin, covar, params, source, pcm);
+    float t2 = psTimerMark ("pmSourceFitPCM");
+
     for (int i = 0; i < dparams->n; i++) {
         if ((pcm->constraint->paramMask != NULL) && pcm->constraint->paramMask->data.PS_TYPE_VECTOR_MASK_DATA[i])
@@ -76 +82 @@
     }
     psTrace ("psphot", 4, "niter: %d, chisq: %f", myMin->iter, myMin->value);
+    float t3 = psTimerMark ("pmSourceFitPCM");
 
     // renormalize output model image (generated by fitting process)
@@ -97 +104 @@
         pmSourceChisqUnsubtracted (source, pcm->modelConv, maskVal);
     }
+    float t4 = psTimerMark ("pmSourceFitPCM");
 
     // set the model success or failure status
@@ -114 +122 @@
 
     source->mode |= PM_SOURCE_MODE_FITTED; // XXX is this needed?
+    float t5 = psTimerMark ("pmSourceFitPCM");
+
+    if (0) {
+        fprintf (stderr, "nIter: %2d, npix: %5d, t1: %6.4f, t2: %6.4f, t3: %6.4f, t4: %6.4f, t5: %6.4f\n", myMin->iter, pcm->nPix, t1, t2, t3, t4, t5);
+    }
 
     psFree(myMin);