Changeset 18788

Timestamp:

Jul 30, 2008, 12:15:15 PM (18 years ago)

Author:

Paul Price

Message:

Work out maximum "valid" radius (for S/N ~ 1; which is what's used by
the moment calculator) and use that for moments.

File:

• trunk/psModules/src/imcombine/pmPSFEnvelope.c (modified) (5 diffs)

trunk/psModules/src/imcombine/pmPSFEnvelope.c

@@ -110 +110 @@
     psImageInit(envelope, SKY_VALUE);
     pmReadout *fakeRO = pmReadoutAlloc(NULL); // Fake readout
+    float maxRadius = 0.0;              // Maximum radius of sources
     for (int i = 0; i < inputs->n; i++) {
         pmPSF *psf = inputs->data[i];   // PSF of interest
@@ -142 +143 @@
             psFree(subImage);
             psFree(subEnv);
+
+            // Get the radius
+            pmModel *model = pmModelFromPSFforXY(psf, x, y, PEAK_FLUX); // Model for source
+            float srcRadius = model->modelRadius(model->params, WEIGHT_VAL); // Radius for source
+            if (srcRadius > maxRadius) {
+                maxRadius = srcRadius;
+            }
+            psFree(model);
         }
 
@@ -234 +243 @@
         source->maskObj = NULL;
 
-        if (!pmSourceDefinePixels(source, readout, x, y, (float)radius)) {
+        if (!pmSourceDefinePixels(source, readout, x, y, maxRadius)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to define pixels for source.");
             psFree(readout);
@@ -241 +250 @@
         }
 
-        if (!pmSourceMoments(source, radius)) {
+        if (!pmSourceMoments(source, maxRadius)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to measure moments for source.");
             psFree(readout);
@@ -255 +264 @@
     options->poissonErrorsParams = true;
     options->stats = psStatsAlloc(PSF_STATS);
-    options->radius = radius;
+    options->radius = maxRadius;
     options->psfTrendMode = PM_TREND_MAP;
     options->psfTrendNx = xOrder;