Changeset 28333

Timestamp:

Jun 15, 2010, 11:15:20 AM (16 years ago)

Author:

Paul Price

Message:

Merging r28332 to fix stacks.

Location:

tags/ipp-20100610/psModules

Files:

• . (modified) (1 prop)
• src/imcombine/pmPSFEnvelope.c (modified) (3 diffs)

tags/ipp-20100610/psModules/src/imcombine/pmPSFEnvelope.c

@@ -33 +33 @@
 
 
-// #define TESTING                         // Enable test output
+//#define TESTING                         // Enable test output
 // #define PEAK_NORM                       // Normalise peaks?
 #define PEAK_FLUX 1.0e4                 // Peak flux for each source
@@ -235 +235 @@
 
             // Get the radius
-            pmModel *model = pmModelFromPSFforXY(psf, x, y, PEAK_FLUX); // Model for source
+            pmModel *model = pmModelFromPSFforXY(psf, source->peak->xf, source->peak->yf, PEAK_FLUX); // Model for source
             if (!model || (model->flags & MODEL_MASK)) {
                 continue;
@@ -321 +321 @@
     numFakes = fakes->n;
 
-    if (numFakes == 0.0) {
+    if (numFakes == 0) {
         psError(PS_ERR_UNKNOWN, false, "No fake sources are suitable for PSF fitting.");
         psFree(fakes);