Changeset 29027

Timestamp:

Aug 23, 2010, 4:14:50 PM (16 years ago)

Author:

eugene

Message:

if modelFlux is missing, cache it (psphotExtendedSourceFits); remove test image dump

Location:

trunk/psphot/src

Files:

• psphotExtendedSourceAnalysis.c (modified) (2 diffs)
• psphotExtendedSourceFits.c (modified) (6 diffs)
• psphotStackMatchPSFsUtils.c (modified) (2 diffs)

trunk/psphot/src/psphotExtendedSourceAnalysis.c

@@ -121 +121 @@
         if (source->peak->y > AnalysisRegion.y1) continue;
 
+        // fprintf (stderr, "xsrc: %f, %f : %f\n", source->peak->xf, source->peak->yf, source->peak->SN); 
+
         // replace object in image
         if (source->tmpFlags & PM_SOURCE_TMPF_SUBTRACTED) {
@@ -178 +180 @@
     }
 
+    // fprintf (stderr, "xsrc : tried %ld objects\n", sources->n);
+
     return true;
 }

trunk/psphot/src/psphotExtendedSourceFits.c

@@ -200 +200 @@
             }
             psFree(job);
-            }
+        }
     }
     psFree (cellGroups);
@@ -270 +270 @@
         // set the radius based on the footprint (also sets the mask pixels)
         if (!psphotSetRadiusFootprint(&radius, readout, source, markVal, 1.0)) {
+            fprintf (stderr, "skipping (1) %f, %f\n", source->peak->xf, source->peak->yf);
             psFree (fitOptions)
             return false;
@@ -280 +281 @@
         // XXX save the psf-based moments for output
         if (!pmSourceMoments (source, radius, 0.0, 0.0, maskVal)) {
+            fprintf (stderr, "skipping (2) %f, %f\n", source->peak->xf, source->peak->yf);
             // subtract the best fit from the object, leave local sky
             pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
@@ -289 +291 @@
         psImage *modelFluxStart = psMemIncrRefCounter (source->modelFlux);
         if (!modelFluxStart) {
-          // XXX raise an error of some kind?
-          continue;
+            pmSourceCacheModel (source, maskVal);
+            modelFluxStart = psMemIncrRefCounter (source->modelFlux);
+            if (!modelFluxStart) {
+                fprintf (stderr, "skipping (3) %f, %f\n", source->peak->xf, source->peak->yf);
+                // XXX raise an error of some kind?
+                continue;
+            }
         }
-
+        
         if (savePics) {
           psphotSaveImage (NULL, readout->image, "image.xp.fits");
@@ -317 +324 @@
           float SNlim = psMetadataLookupF32 (&status, model, "SNLIM_VALUE");
           assert (status);
+
+          // fprintf (stderr, "xfit: %f, %f : %f\n", source->peak->xf, source->peak->yf, source->peak->SN); 
 
           // limit selection to some SN limit
@@ -449 +458 @@
     psFree (fitOptions);
 
+    // fprintf (stderr, "xfit : tried %ld objects\n", sources->n);
+
     // change the value of a scalar on the array (wrap this and put it in psArray.h)
     scalar = job->args->data[7];

trunk/psphot/src/psphotStackMatchPSFsUtils.c

@@ -346 +346 @@
     if (!fake) goto escape;
 
-    dumpImage(fake, readoutSrc, index, "fake");
-    dumpImage(readoutSrc,  readoutSrc, index, "real");
+    // dumpImage(fake, readoutSrc, index, "fake");
+    // dumpImage(readoutSrc,  readoutSrc, index, "real");
 
     if (threads) pmSubtractionThreadsInit();
@@ -380 +380 @@
     }
 
-    dumpImage(readoutOut, readoutSrc, index, "conv");
-    dumpImageDiff(readoutOut, fake, readoutSrc, index, "diff");
+    // dumpImage(readoutOut, readoutSrc, index, "conv");
+    // dumpImageDiff(readoutOut, fake, readoutSrc, index, "diff");
 
     psFree(fake);