Changeset 34085 for trunk/psModules/src/objects/pmPSFtryMakePSF.c

Timestamp:

Jun 26, 2012, 11:31:38 AM (14 years ago)

Author:

eugene

Message:

re-enable MODEL_VAR option for linear photometry fit

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmPSFtryMakePSF.c (modified) (4 diffs)

trunk/psModules/src/objects/pmPSFtryMakePSF.c

@@ -231 +231 @@
         // XXX we are using the same stats structure on each pass: do we need to re-init it?
         // XXX we hardwire this to SAMPLE stats above (psphotChoosePSF.c), hardwire here instead?
-        psStatsOptions meanOption = psStatsMeanOption(psf->psfTrendStats->options);
-        psStatsOptions stdevOption = psStatsStdevOption(psf->psfTrendStats->options);
-
+     
         pmTrend2D *trend = NULL;
-        float mean, stdev;
 
         // XXX we are using the same stats structure on each pass: do we need to re-init it?
@@ -249 +246 @@
             return true;
         }
+
+# if (PS_TRACE_ON)
+        float mean, stdev;
+        psStatsOptions meanOption = psStatsMeanOption(psf->psfTrendStats->options);
+        psStatsOptions stdevOption = psStatsStdevOption(psf->psfTrendStats->options);
         mean = psStatsGetValue (trend->stats, meanOption);
         stdev = psStatsGetValue (trend->stats, stdevOption);
         psTrace ("psModules.objects", 4, "clipped E0 : %f +/- %f keeping %ld of %ld\n", mean, stdev, psf->psfTrendStats->clippedNvalues, e0->n);
+# endif
+
         if (psf->psfTrendMode == PM_TREND_MAP) psImageMapCleanup (trend->map);
         pmSourceVisualPSFModelResid (trend, x, y, e0, srcMask);
@@ -264 +268 @@
             return true;
         }
+# if (PS_TRACE_ON)
         mean = psStatsGetValue (trend->stats, meanOption);
         stdev = psStatsGetValue (trend->stats, stdevOption);
         psTrace ("psModules.objects", 4, "clipped E1 : %f +/- %f keeping %ld of %ld\n", mean, stdev, psf->psfTrendStats->clippedNvalues, e1->n);
+# endif
         if (psf->psfTrendMode == PM_TREND_MAP) psImageMapCleanup (trend->map);
         pmSourceVisualPSFModelResid (trend, x, y, e1, srcMask);
@@ -279 +285 @@
             return true;
         }
+# if (PS_TRACE_ON)
         mean = psStatsGetValue (trend->stats, meanOption);
         stdev = psStatsGetValue (trend->stats, stdevOption);
         psTrace ("psModules.objects", 4, "clipped E2 : %f +/- %f keeping %ld of %ld\n", mean, stdev, psf->psfTrendStats->clippedNvalues, e2->n);
+# endif
         if (psf->psfTrendMode == PM_TREND_MAP) psImageMapCleanup (trend->map);
         pmSourceVisualPSFModelResid (trend, x, y, e2, srcMask);