Changeset 38560

Timestamp:

Jul 2, 2015, 7:36:29 AM (11 years ago)

Author:

bills

Message:

Sometimes sources fit with a saturated star profile have the center of
the model too far off of the image. These cause the code that sets up the
source's pixels and other images to be left NULL. Handle this case.

Location:

trunk/psphot/src

Files:

• psphotDeblendSatstars.c (modified) (1 diff)
• psphotMergeSources.c (modified) (1 diff)
• psphotReplaceUnfit.c (modified) (1 diff)
• psphotStackUpdateReadout.c (modified) (4 diffs)

trunk/psphot/src/psphotDeblendSatstars.c

@@ -136 +136 @@
         source = sources->data[N];
 
+        if (!source->pixels) continue;
 #ifndef DEBLEND_PASS2_SOURCES
         // XXX: Need to define this if we want to rerun the satstar stuff again on the pass2 sources

trunk/psphot/src/psphotMergeSources.c

@@ -1013 +1013 @@
                         } else {
                             // What to do here? 
-                            psAssert (pcm, "pmPCMinit failed!");
+                            // psAssert (pcm, "pmPCMinit failed!");
+                            psFree (sourceOut->modelEXT);
+                            sourceOut->modelEXT = NULL;
                         }
                     } else {

trunk/psphot/src/psphotReplaceUnfit.c

@@ -378 +378 @@
 
         if (model->isPCM) {
-#if 0
-            psAssert(false, "this section is not complete");
-
-            pmSourceCachePSF (source, maskVal);
-
-            psKernel *psfKernel = pmPCMkernelFromPSF(source, psfSize);
-            if (!psfKernel) { 
-                psWarning ("no psf kernel");
-            }
-
-            // generate an image of the right size
-            psImage *rawModelFlux = psImageCopy (NULL, source->pixels, PS_TYPE_F32);
-            psImageInit (rawModelFlux, 0.0);
-          
-            // insert the model image normalized to 1.0
-            pmModelAdd (rawModelFlux, NULL, model, PM_MODEL_OP_FULL | PM_MODEL_OP_NORM, maskVal);
-
-            psImageConvolveFFT (source->modelFlux, rawModelFlux, NULL, 0, psfKernel);
-            psFree (psfKernel);
-            psFree (rawModelFlux);
-#endif
-           pmPCMdata *pcm = pmPCMinit (source, fitOptions, model, maskVal, psfSize);
+            pmPCMdata *pcm = pmPCMinit (source, fitOptions, model, maskVal, psfSize);
             if (pcm) {
                 pmPCMCacheModel (source, maskVal, psfSize, pcm->nsigma);
                 psFree(pcm);
             } else {
-                psAssert (pcm, "pmPCMinit failed!");
+                psFree(source->modelEXT);
+                source->modelEXT = NULL;
             }
           

trunk/psphot/src/psphotStackUpdateReadout.c

@@ -362 +362 @@
             source->modelPSF->residuals = psf->residuals;
         }
+
         if (!(source->mode & PM_SOURCE_MODE_PSFMODEL)) {
             // The cmf loaders unconditionallly create psf models even if the source did not have one.
@@ -372 +373 @@
         }
 
-        // make sure that the window radius is large enough. Should we do this regardless of whether
-        // or not the source is extended?
+        // make sure that the window radius is large enough.
+        // Should we do this regardless of whether or not the source is extended?
         float fitRadius = NAN;
         float windowRadius = NAN;
-        if (1 || source->modelEXT) {
-            if (!psphotSetRadiusMoments (&fitRadius, &windowRadius, readout, source, markVal)) {
-                psError (PSPHOT_ERR_UNKNOWN, false, "failed to set radius for ext source");
-                return false;
-            }
-        }
+        if (!psphotSetRadiusMoments (&fitRadius, &windowRadius, readout, source, markVal)) {
+            psError (PSPHOT_ERR_UNKNOWN, false, "failed to set radius for ext source");
+            return false;
+        }
+        // We are getting some sources near the edge of skycells which are marked as having
+        // been fit with saturated star model but have peak coordinates far outside the
+        // image. When this happens an error is left on the stack.
+        psErrorClear();
         
         // If we find a good model we will cache it below.
@@ -431 +434 @@
                 // I Should be getting that information from the recipe.
                 pmPCMdata *pcm = pmPCMinit (source, fitOptions, model, maskVal, psfSize);
-                if (!pcm) {
-                    psError (PSPHOT_ERR_UNKNOWN, false, "failed to to initialize PCM for model");
-                    return false;
+                if (pcm) {
+                    model->params->data.F32[PM_PAR_I0] = 1.0;
+                    float normFlux = model->class->modelFlux(model->params);
+                    float I0 = modelFlux / normFlux;
+                    if (isfinite(I0)) {
+                        model->params->data.F32[PM_PAR_I0] = I0;
+                        goodModel = true;
+                        // Usually this it is set when doing the fit. Since we are instantiating the model we
+                        // set it explicitly here. 
+                        model->isPCM = true;
+                    }
+                    psFree(pcm);
+                } else {
+                    // psError (PSPHOT_ERR_UNKNOWN, false, "failed to to initialize PCM for model");
+                    // return false;
+                    // fall through
                 }
-                model->params->data.F32[PM_PAR_I0] = 1.0;
-                // XXX: this duplicates work that pmPCMCacheModel does
-                // pmPCMMakeModel (source, model, pcm->nsigma, maskVal, psfSize);
-                float normFlux = model->class->modelFlux(model->params);
-                float I0 = modelFlux / normFlux;
-                if (isfinite(I0)) {
-                    model->params->data.F32[PM_PAR_I0] = I0;
-                    goodModel = true;
-                    // Usually this it is set when doing the fit. Since we are instantiating the model we
-                    // set it explicitly here. 
-                    model->isPCM = true;
-                }
-                psFree(pcm);
             }
             if (!goodModel) {
@@ -458 +461 @@
                 // XXX However we aren't going to cache it below so...
                 source->type = PM_SOURCE_TYPE_STAR;
+                psFree(source->modelEXT);
+                source->modelEXT = NULL;
                 model = NULL;
             }