Changeset 32157 for branches/eam_branches/ipp-20110710/psphot/src/psphotExtendedSourceFits.c

Timestamp:

Aug 21, 2011, 10:44:17 AM (15 years ago)

Author:

eugene

Message:

distinguish window used for moment calculation and window used for model fitting more clearly; re-generate the cached model after PCM fitting using new function (instead of caching the fit models); add function to set window which shrinks as well as expands as needed

Location:

branches/eam_branches/ipp-20110710/psphot/src

Files:

• . (modified) (1 prop)
• psphotExtendedSourceFits.c (modified) (7 diffs)

branches/eam_branches/ipp-20110710/psphot/src

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

branches/eam_branches/ipp-20110710/psphot/src/psphotExtendedSourceFits.c

@@ -316 +316 @@
         Next ++;
 
-        // set the radius based on the first radial moment (also sets the mask pixels)
-        if (!psphotSetRadiusMoments(&fitRadius, &windowRadius, readout, source, markVal)) {
-            fprintf (stderr, "skipping (1) %f, %f\n", source->peak->xf, source->peak->yf);
-            pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
-            // XXX raise an error of some kind or set a flag bit
-            continue;
-        }
+        // set the fit radius based on the first radial moment (also sets the mask pixels)
+        psphotSetRadiusMomentsExact(&fitRadius, &windowRadius, readout, source, markVal);
 
         // Recalculate the source moments using the larger extended-source moments radius.  At
@@ -332 +327 @@
             fprintf (stderr, "skipping (2) %f, %f\n", source->peak->xf, source->peak->yf);
             *source->moments = psfMoments;
+
+            // probably need to bump up the size for subtraction
             pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
             // XXX raise an error flag of some kind
             continue;
         }
-
-        // save the PSF-based modelFlux here in case we need to subtract it (for failure).  If
-        // it does not exist, attempt to generate it.  Give up if we cannot even do that.
-        psImage *modelFluxStart = psMemIncrRefCounter (source->modelFlux);
-        if (!modelFluxStart) {
-            pmSourceCacheModel (source, maskVal);
-            modelFluxStart = psMemIncrRefCounter (source->modelFlux);
-            if (!modelFluxStart) {
-                fprintf (stderr, "skipping (3) %f, %f\n", source->peak->xf, source->peak->yf);
-                *source->moments = psfMoments;
-                pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
-                // XXX raise an error of some kind?
-                continue;
-            }
-        }
-        
-        // array to store the pointers to the model flux images while the models are being fitted
-        psArray *modelFluxes = psArrayAllocEmpty (models->list->n);
 
         // allocate the array to store the model fits
@@ -417 +396 @@
                   continue;
               }
-              pmSourceCacheModel (source, maskVal);
               psTrace ("psphot", 4, "fit plain model for %f, %f : %s chisq = %f (npix: %d, niter: %d)\n", 
                        source->moments->Mx, source->moments->My, pmModelClassGetName (modelFit->type), modelFit->chisq, modelFit->nPix, modelFit->nIter);
@@ -426 +404 @@
               }
           }
-
-          // save each of the model flux images for now, and (below) store the best
-          psArrayAdd (modelFluxes, 4, source->modelFlux);
 
           pmSourceExtFitPars *extFitPars = pmSourceExtFitParsAlloc();
@@ -477 +452 @@
           psTrace ("psphot", 5, "failed to fit extended source model to object at %f, %f", source->moments->Mx, source->moments->My);
 
-          // replace original model, subtract it
-          psFree (source->modelFlux);
-          source->modelFlux = modelFluxStart;
+          // ensure the modelEXT is cached
+          pmSourceCacheModel (source, maskVal);
 
           *source->moments = psfMoments;
           pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
-
-          psFree (modelFluxes);
 
           continue;
@@ -493 +465 @@
         source->modelEXT = psMemIncrRefCounter (source->modelFits->data[minModel]);
 
-        // save the modelFlux for the best model
-        psFree (source->modelFlux);
-        source->modelFlux = psMemIncrRefCounter (modelFluxes->data[minModel]);
+        // adjust the window so the subtraction covers the faint wings
+        psphotSetRadiusMoments(&fitRadius, &windowRadius, readout, source, markVal);
+
+        // cache the model flux
+        if (source->modelEXT->isPCM) {
+            pmPCMCacheModel (source, maskVal, psfSize);
+        } else {
+            pmSourceCacheModel (source, maskVal);
+        }
 
         // replace the original moments
@@ -502 +480 @@
         // subtract the best fit from the object, leave local sky
         pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
-
-        // the initial model flux is no longer needed
-        psFree (modelFluxStart);
-        psFree (modelFluxes);
 
         psTrace ("psphot", 4, "best ext model for %f, %f : %s chisq = %f\n", source->moments->Mx, source->moments->My, pmModelClassGetName (source->modelEXT->type), source->modelEXT->chisq);

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest