Changeset 36086 for trunk/psphot/src/psphotBlendFit.c

Timestamp:

Aug 31, 2013, 6:02:26 AM (13 years ago)

Author:

eugene

Message:

merge changes from EAM branch (update tap script for galaxies; count deblended satstars for log message; scale down EXT window a bit for speed (OK?); enable interactive mode for PCM fitting; allow NONCONVERGE extended fit models to succeed; init EXT model fits with EXT_AND_SKY just in case; extra verbosity and various experiments on the index iterations)

Location:

trunk/psphot

Files:

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

trunk/psphot/src/psphotBlendFit.c

@@ -273 +273 @@
         pmSource *source = sources->data[i];
 
+# if (0)
         int TEST_ON = false;
-# if (0)
 # define TEST_X 653
 # define TEST_Y 466
@@ -342 +342 @@
         if (source->mode & PM_SOURCE_MODE_EXT_LIMIT) {
             if (psphotFitBlob (readout, source, newSources, psf, fitOptions, maskVal, markVal)) {
+# if (PS_TRACE_ON)
                 if (TEST_ON) {
                     psTraceSetLevel("psLib.math.psMinimizeLMChi2", 0);
                 }
+# endif
                 psTrace ("psphot", 5, "source at %7.1f, %7.1f is ext", source->peak->xf, source->peak->yf);
                 Next ++;
@@ -351 +353 @@
         } else {
             if (psphotFitBlend (readout, source, psf, fitOptions, maskVal, markVal)) {
+# if (PS_TRACE_ON)
                 if (TEST_ON) {
                     psTraceSetLevel("psLib.math.psMinimizeLMChi2", 0);
                 }
+# endif
                 source->type = PM_SOURCE_TYPE_STAR;
                 psTrace ("psphot", 5, "source at %7.1f, %7.1f is psf", source->peak->xf, source->peak->yf);