Changeset 25313 for trunk/psModules

Timestamp:

Sep 10, 2009, 11:15:20 AM (17 years ago)

Author:

Paul Price

Message:

Nigel Metcalfe points out that we shouldn't use extended sources as stamps when convolving to a target PSF. To avoid this, I'm throwing out extended sources when I create the fake image. This requires an API change to pmReadoutFake(). I think I've caught all instances that use that.

Location:

trunk/psModules/src

Files:

• camera/pmReadoutFake.c (modified) (3 diffs)
• camera/pmReadoutFake.h (modified) (2 diffs)
• imcombine/pmPSFEnvelope.c (modified) (2 diffs)

trunk/psModules/src/camera/pmReadoutFake.c

@@ -28 +28 @@
 #define MODEL_TYPE "PS_MODEL_RGAUSS"    // Type of model to use
 #define MAX_AXIS_RATIO 20.0             // Maximum axis ratio for PSF model
-#define SOURCE_MASK (PM_SOURCE_MODE_DEFECT | PM_SOURCE_MODE_CR_LIMIT) // Mask to apply to input sources
 #define MODEL_MASK (PM_MODEL_STATUS_NONCONVERGE | PM_MODEL_STATUS_OFFIMAGE | \
                     PM_MODEL_STATUS_BADARGS | PM_MODEL_STATUS_LIMITS) // Mask to apply to models
@@ -162 +161 @@
 
 bool pmReadoutFakeFromSources(pmReadout *readout, int numCols, int numRows, const psArray *sources,
-                              const psVector *xOffset, const psVector *yOffset, const pmPSF *psf,
-                              float minFlux, int radius, bool circularise, bool normalisePeak)
+                              pmSourceMode sourceMask, const psVector *xOffset, const psVector *yOffset,
+                              const pmPSF *psf, float minFlux, int radius,
+                              bool circularise, bool normalisePeak)
 {
     PS_ASSERT_ARRAY_NON_NULL(sources, false);
@@ -178 +178 @@
             continue;
         }
-        if (source->mode & SOURCE_MASK) {
+        if (source->mode & sourceMask) {
             continue;
         }

trunk/psModules/src/camera/pmReadoutFake.h

@@ -11 +11 @@
 #include <pmTrend2D.h>
 #include <pmPSF.h>
+#include <pmSourceMasks.h>
 
 /// Generate a fake readout from an array of sources
@@ -16 +17 @@
                               int numCols, int numRows, ///< Dimension of image
                               const psArray *sources, ///< Array of pmSource
+                              pmSourceMode sourceMask, ///< Mask for sources
                               const psVector *xOffset, ///< x offsets for sources (source -> img), or NULL
                               const psVector *yOffset, ///< y offsets for sources (source -> img), or NULL

trunk/psModules/src/imcombine/pmPSFEnvelope.c

@@ -124 +124 @@
         pmResiduals *resid = psf->residuals;// PSF residuals
         psf->residuals = NULL;
-        if (!pmReadoutFakeFromSources(fakeRO, fakeSize, fakeSize, fakes, xOffset, yOffset, psf,
+        if (!pmReadoutFakeFromSources(fakeRO, fakeSize, fakeSize, fakes, 0, xOffset, yOffset, psf,
                                       NAN, radius, true, true)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to generate fake readout.");
@@ -298 +298 @@
         }
 
-        // measure the source moments: tophat windowing, no pixel S/N cutoff
+        // measure the source moments: tophat windowing, no pixel S/N cutoff
         if (!pmSourceMoments(source, maxRadius, 0.0, 1.0)) {
             // Can't do anything about it; limp along as best we can