Changeset 31546

Timestamp:

May 12, 2011, 4:49:59 PM (15 years ago)

Author:

eugene

Message:

more description of psf solution; save psf moments before fitting extended source models (and restore after)

Location:

branches/eam_branches/ipp-20110505/psphot/src

Files:

• psphotChoosePSF.c (modified) (3 diffs)
• psphotExtendedSourceFits.c (modified) (5 diffs)

branches/eam_branches/ipp-20110505/psphot/src/psphotChoosePSF.c

@@ -373 +373 @@
     }
 
+
+
     char *modelName = pmModelClassGetName (psf->type);
     psLogMsg ("psphot.pspsf", PS_LOG_INFO, "select psf model: %f sec\n", psTimerMark ("psphot.choose.psf"));
@@ -503 +505 @@
       }
       psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "PSF_EXT1", PS_META_REPLACE, "PSF extra param 1", stats->sampleMean);
+      psLogMsg ("psphot", PS_LOG_DETAIL, "PSF extra parameter 1: %f +/- %f", stats->sampleMean, stats->sampleStdev);
     }
 
@@ -511 +514 @@
       }
       psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "PSF_EXT2", PS_META_REPLACE, "PSF extra param 2", stats->sampleMean);
-    }
-
-    psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "ANGLE",    PS_META_REPLACE, "PSF angle",           axes.theta);
+      psLogMsg ("psphot", PS_LOG_DETAIL, "PSF extra parameter 2: %f +/- %f", stats->sampleMean, stats->sampleStdev);
+    }
+
+    // psMetadataAddF32 (readout->analysis, PS_LIST_TAIL, "ANGLE",    PS_META_REPLACE, "PSF angle",           axes.theta);
     psMetadataAddS32 (readout->analysis, PS_LIST_TAIL, "NPSFSTAR", PS_META_REPLACE, "Number of stars used to make PSF", psf->nPSFstars);
+
+    // psLogMsg ("psphot", PS_LOG_DETAIL, "PSF angle: %f, nstars: %d", axes.theta, psf->nPSFstars);
 
     char *psfModelName = pmModelClassGetName(psf->type);

branches/eam_branches/ipp-20110505/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);