Changeset 31673 for trunk/psphot/src/psphotExtendedSourceFits.c

Timestamp:

Jun 22, 2011, 12:54:41 AM (15 years ago)

Author:

eugene

Message:

various fixes from eam branch

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src/psphotExtendedSourceFits.c (modified) (5 diffs)

trunk/psphot/src/psphotExtendedSourceFits.c

@@ -268 +268 @@
     float radius;
     psScalar *scalar = NULL;
+    pmMoments psfMoments;
 
     // arguments: readout, sources, models, region, psfSize, maskVal, markVal
@@ -333 +334 @@
         // this uses the footprint to judge both radius and aperture?
         // XXX save the psf-based moments for output
+        psfMoments = *source->moments;
         if (!pmSourceMoments (source, radius, 0.0, 0.0, 0.0, maskVal)) {
+            // subtract the best fit from the object, leave local sky
             fprintf (stderr, "skipping (2) %f, %f\n", source->peak->xf, source->peak->yf);
-            // subtract the best fit from the object, leave local sky
+            *source->moments = psfMoments;
             pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
             // XXX raise an error flag of some kind
@@ -348 +351 @@
             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?
@@ -467 +471 @@
           source->modelFlux = modelFluxStart;
 
+          *source->moments = psfMoments;
           pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
 
@@ -492 +497 @@
         source->modelFlux = psMemIncrRefCounter (modelFluxes->data[minModel]);
 
+        // replace the original moments
+        *source->moments = psfMoments;
+
         // subtract the best fit from the object, leave local sky
         pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);