Changeset 19009 for trunk/psModules/src/imcombine/pmPSFEnvelope.c

Timestamp:

Aug 11, 2008, 12:38:55 PM (18 years ago)

Author:

Paul Price

Message:

Another installment in the saga to ensure pmSourceMoments doesn't go nuts: limiting the maximum radius.

File:

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

trunk/psModules/src/imcombine/pmPSFEnvelope.c

@@ -146 +146 @@
             // 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
+            float srcRadius = model->modelRadius(model->params, PS_SQR(WEIGHT_VAL)); // Radius for source
             if (srcRadius > maxRadius) {
                 maxRadius = srcRadius;
@@ -167 +167 @@
     }
     psFree(fakeRO);
+
+    if (maxRadius > radius) {
+        maxRadius = radius;
+    }
 
 #ifdef TESTING
@@ -215 +219 @@
     // *** readout->weight = (psImage*)psBinaryOp(NULL, readout->image, "*", readout->image);
     // *** readout->weight = (psImage*)psBinaryOp(NULL, readout->image, "*", psScalarAlloc(WEIGHT_FACTOR, PS_TYPE_F32));
-    readout->weight = (psImage*)psBinaryOp(NULL, readout->image, "+", psScalarAlloc(PS_SQR(WEIGHT_VAL), PS_TYPE_F32));
+    readout->weight = (psImage*)psBinaryOp(NULL, readout->image, "+", psScalarAlloc(WEIGHT_VAL, PS_TYPE_F32));
     readout->mask = psImageAlloc(numCols, numRows, PS_TYPE_MASK);
     psImageInit(readout->mask, 0);