Changeset 23955

Timestamp:

Apr 23, 2009, 2:54:27 PM (17 years ago)

Author:

Paul Price

Message:

Catching bad source models (using flags) and ejecting these from the fitting of the PSF envelope.

Location:

trunk/psModules/src

Files:

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

trunk/psModules/src/camera/pmReadoutFake.c

@@ -29 +29 @@
 #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
 
 
@@ -123 +125 @@
 
         pmModel *fakeModel = pmModelFromPSFforXY(psf, x, y, flux);
-        if (!fakeModel) {
+        if (!fakeModel || (fakeModel->flags & MODEL_MASK)) {
+            psFree(fakeModel);
             continue;
         }

trunk/psModules/src/imcombine/pmPSFEnvelope.c

@@ -33 +33 @@
 
 
-//#define TESTING                         // Enable test output
+#define TESTING                         // Enable test output
 #define PEAK_FLUX 1.0e4                 // Peak flux for each source
 #define SKY_VALUE 0.0e0                 // Sky value for fake image
@@ -113 +113 @@
     pmReadout *fakeRO = pmReadoutAlloc(NULL); // Fake readout
     float maxRadius = 0.0;              // Maximum radius of sources
+    psVector *numbers = psVectorAlloc(numFakes, PS_TYPE_S32); // Number of detections for each source
+    psVectorInit(numbers, 0);
     for (int i = 0; i < inputs->n; i++) {
         pmPSF *psf = inputs->data[i];   // PSF of interest
@@ -127 +129 @@
             psFree(xOffset);
             psFree(fakes);
+            psFree(numbers);
             psf->residuals = resid;
             return NULL;
@@ -140 +143 @@
 
             double flux = fakeRO->image->data.F32[(int)y][(int)x];
+            if (flux > 0) {
+                // The source is present
+                numbers->data.S32[j]++;
+            }
             float norm = PEAK_FLUX / flux; // Normalisation for source
             psRegion region = psRegionSet(x - radius, x + radius, y - radius, y + radius); // PSF region
@@ -190 +197 @@
 
     // Put the fake sources onto a full-size image
+    psArray *goodFakes = psArrayAllocEmpty(numFakes); // Good fake sources
     pmReadout *readout = pmReadoutAlloc(NULL); // Readout to contain envelope pixels
     readout->image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
@@ -195 +203 @@
     for (int i = 0; i < numFakes; i++) {
         pmSource *source = fakes->data[i]; // Fake source
+        if (numbers->data.S32[i] > 0) {
+            psArrayAdd(goodFakes, goodFakes->n, source);
+        }
+
         // Position of source on fake image
         int xFake = source->peak->x + xOffset->data.S32[i];
@@ -213 +225 @@
             psFree(yOffset);
             psFree(fakes);
+            psFree(numbers);
             return NULL;
         }
@@ -220 +233 @@
     psFree(yOffset);
     psFree(envelope);
+    psFree(numbers);
+
+    psFree(fakes);
+    fakes = goodFakes;
+    numFakes = fakes->n;
 
     // XXX Setting the variance seems to be an art