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

Timestamp:

Aug 3, 2011, 10:32:41 AM (15 years ago)

Author:

eugene

Message:

add several non-parametric values to extended source table; convert pmSourceIO_* functions to use autogenerated code for different formats; add optional timing marks to pmSourceFitPCM

File:

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

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

@@ -48 +48 @@
 // convolved model image.
 
+# define TIMING 0
+
 bool pmSourceFitPCM (pmPCMdata *pcm, pmSource *source, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal, int psfSize) {
     
-    psTimerStart ("pmSourceFitPCM");
+    if (TIMING) { psTimerStart ("pmSourceFitPCM"); }
 
     psVector *params  = pcm->modelConv->params;
@@ -66 +68 @@
     psImage *covar = psImageAlloc (params->n, params->n, PS_TYPE_F32);
 
-    float t1 = psTimerMark ("pmSourceFitPCM");
+    float t1, t2, t3, t4, t5;
+    if (TIMING) { t1 = psTimerMark ("pmSourceFitPCM"); }
 
     bool fitStatus = pmPCM_MinimizeChisq (myMin, covar, params, source, pcm);
-    float t2 = psTimerMark ("pmSourceFitPCM");
+    if (TIMING) { t2 = psTimerMark ("pmSourceFitPCM"); }
 
     for (int i = 0; i < dparams->n; i++) {
@@ -82 +85 @@
     }
     psTrace ("psphot", 4, "niter: %d, chisq: %f", myMin->iter, myMin->value);
-    float t3 = psTimerMark ("pmSourceFitPCM");
+    if (TIMING) { t3 = psTimerMark ("pmSourceFitPCM"); }
 
     // renormalize output model image (generated by fitting process)
@@ -104 +107 @@
         pmSourceChisqUnsubtracted (source, pcm->modelConv, maskVal);
     }
-    float t4 = psTimerMark ("pmSourceFitPCM");
+    if (TIMING) { t4 = psTimerMark ("pmSourceFitPCM"); }
 
     // set the model success or failure status
@@ -122 +125 @@
 
     source->mode |= PM_SOURCE_MODE_FITTED; // XXX is this needed?
-    float t5 = psTimerMark ("pmSourceFitPCM");
+    if (TIMING) { 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);
-    }
+     if (TIMING) {
+        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);