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

Timestamp:

Sep 22, 2009, 5:44:48 PM (17 years ago)

Author:

Paul Price

Message:

Don't normalise the sources --- in any case, the peak may not be the centre.

File:

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

trunk/psModules/src/imcombine/pmPSFEnvelope.c

@@ -34 +34 @@
 
 // #define TESTING                         // Enable test output
+// #define PEAK_NORM                       // Normalise peaks?
 #define PEAK_FLUX 1.0e4                 // Peak flux for each source
 #define SKY_VALUE 0.0e0                 // Sky value for fake image
@@ -170 +171 @@
             float y = source->peak->yf + yOffset->data.S32[j]; // y coordinate of source
 
+#ifdef PEAK_NORM
             // Perhaps I'm being paranoid, but specify a range to check
             int uMax = PS_MIN(x + radius, numCols - 1), uMin = PS_MAX(x - radius, 0);
@@ -182 +184 @@
                 }
             }
-
             if (!isfinite(flux) || flux < 0) {
                 continue;
             }
             float norm = PEAK_FLUX / flux; // Normalisation for source
+#endif
             psRegion region = psRegionSet(x - radius, x + radius, y - radius, y + radius); // PSF region
             psImage *subImage = psImageSubset(fakeRO->image, region); // Subimage of fake PSF
             psImage *subEnv = psImageSubset(envelope, region); // Subimage of envelope
+#ifdef PEAK_NORM
             psBinaryOp(subImage, subImage, "*", psScalarAlloc(norm, PS_TYPE_F32));
+#endif
             psBinaryOp(subEnv, subEnv, "MAX", subImage);
             psFree(subImage);