Changeset 25433 for branches/eam_branches/20090715/psphot/src/psphotSourceFits.c

Timestamp:

Sep 17, 2009, 2:26:32 PM (17 years ago)

Author:

eugene

Message:

change radius for extended sources to use footprint; clean up some of the visualizations; plug some leaks

File:

• branches/eam_branches/20090715/psphot/src/psphotSourceFits.c (modified) (9 diffs)

branches/eam_branches/20090715/psphot/src/psphotSourceFits.c

@@ -223 +223 @@
     if (source->peak->SN < EXT_MIN_SN) return false;
 
+    float radius = psphotSetRadiusEXT (readout, source, markVal);
+
+    // XXX note that this changes the source moments that are published...
     // recalculate the source moments using the larger extended-source moments radius
     // at this stage, skip Gaussian windowing, and do not clip pixels by S/N
-    if (!pmSourceMoments (source, EXT_MOMENTS_RAD, 0.0, 0.0)) return false;
+    // XXX use the deteremined value of PSF_MOMENTS_RADIUS and SIGMA and scale up?
+    // XXX increase the moments radius iteratively until the measured sigma / input < f?
+    // XXX use the footprint somehow to judge both radius and aperture?
+    if (!pmSourceMoments (source, radius, 0.0, 0.0)) return false;
 
     psTrace ("psphot", 5, "trying blob...\n");
@@ -277 +283 @@
 
     // both models failed; reject them both
+    // XXX -- change type flags to psf in this case and keep original moments?
     psFree (EXT);
     psFree (DBL);
@@ -287 +294 @@
     // save new model
     source->modelEXT = EXT;
+    source->modelEXT->radiusFit = radius;
     source->type = PM_SOURCE_TYPE_EXTENDED;
     source->mode |= PM_SOURCE_MODE_EXTMODEL;
@@ -294 +302 @@
     pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
     source->tmpFlags |=  PM_SOURCE_TMPF_SUBTRACTED;
+
+# if (PS_TRACE_ON)   
     psTrace ("psphot", 5, "blob as EXT: %f %f\n", EXT->params->data.F32[PM_PAR_XPOS], EXT->params->data.F32[PM_PAR_YPOS]);
+    if (psTraceGetLevel("psphot") >= 6) {
+        psLogMsg ("psphot", 1, "source 2:\n");
+        for (int i = 0; i < source->modelEXT->params->n; i++) {
+            psLogMsg ("psphot", 1, "PAR %d : %f +/- %f\n", i, source->modelEXT->params->data.F32[i], source->modelEXT->dparams->data.F32[i]);
+        }
+    }
+# endif
+
     return true;
 
@@ -306 +324 @@
     source->tmpFlags |= PM_SOURCE_TMPF_SUBTRACTED;
     source->mode     |= PM_SOURCE_MODE_PAIR;
+    source->modelPSF->radiusFit = radius;
 
     // copy most data from the primary source (modelEXT, blends stay NULL)
-    // XXX use pmSourceCopy?
     pmSource *newSrc = pmSourceCopy (source);
     newSrc->modelPSF = psMemIncrRefCounter (DBL->data[1]);
+    newSrc->modelPSF->radiusFit = radius;
 
     // build cached models and subtract
@@ -317 +336 @@
     pmSourceCacheModel (newSrc, maskVal);
     pmSourceSub (newSrc, PM_MODEL_OP_FULL, maskVal);
+
+# if (PS_TRACE_ON)   
     psTrace ("psphot", 5, "blob as DBL: %f %f\n", ONE->params->data.F32[PM_PAR_XPOS], ONE->params->data.F32[PM_PAR_YPOS]);
+    if (psTraceGetLevel("psphot") >= 6) {
+        psLogMsg ("psphot", 1, "source 1:\n");
+        for (int i = 0; i < newSrc->modelPSF->params->n; i++) {
+            psLogMsg ("psphot", 1, "PAR %d : %f +/- %f\n", i, newSrc->modelPSF->params->data.F32[i], newSrc->modelPSF->dparams->data.F32[i]);
+        }
+        psLogMsg ("psphot", 1, "source 2:\n");
+        for (int i = 0; i < source->modelPSF->params->n; i++) {
+            psLogMsg ("psphot", 1, "PAR %d : %f +/- %f\n", i, source->modelPSF->params->data.F32[i], source->modelPSF->dparams->data.F32[i]);
+        }
+        psphotVisualShowResidualImage (readout);
+    }
+# endif
 
     psArrayAdd (newSources, 100, newSrc);
@@ -356 +389 @@
     // save the PSF model from the Ensemble fit
     PSF = source->modelPSF;
-    psphotCheckRadiusPSFBlend (readout, source, PSF, markVal, 8.0);
+    // psphotCheckRadiusPSFBlend (readout, source, PSF, markVal, 8.0);
     if (isnan(PSF->params->data.F32[1])) psAbort("nan in dbl fit");
 
@@ -390 +423 @@
 
     // if (isnan(EXT->params->data.F32[1])) psAbort("nan in ext fit");
-
-    psphotCheckRadiusEXT (readout, source, EXT, markVal);
+    // psphotCheckRadiusEXT (readout, source, EXT, markVal);
 
     if ((source->moments->Mxx < 1e-3) || (source->moments->Myy < 1e-3)) {
@@ -401 +433 @@
     return (EXT);
 }
-