Changeset 8398

Timestamp:

Aug 16, 2006, 2:53:55 PM (20 years ago)

Author:

Paul Price

Message:

Synching to revised pmFlatNormalize function API.

File:

• trunk/ppMerge/src/ppMergeScaleZero.c (modified) (3 diffs)

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -6 +6 @@
 #include "ppMerge.h"
 #include "ppMergeScaleZero.h"
-
-#define MAX_ITER 10                     // Maximum number of iterations for pmFlatNormalize
-#define TOLERANCE 1e-3                  // Tolerance to reach for pmFlatNormalize
-
 
 // Extract a particular statistic from the stats
@@ -279 +275 @@
     if (options->scale) {
         // Need to normalize over the focal plane
-        bool converge = true;           // Did we converge?
         if (psTraceGetLevel(__func__) > 9) {
             for (int i = 0; i < gains->n; i++) {
@@ -285 +280 @@
             }
         }
-        psVector *fluxes = pmFlatNormalize(&converge, gains, background, MAX_ITER, TOLERANCE);
-        if (!converge || !fluxes) {
+        psVector *fluxes = NULL;        // Solution to fluxes
+        if (!pmFlatNormalize(&fluxes, &gains, background)) {
             psLogMsg(__func__, PS_LOG_WARN, "Normalisation failed to converge --- continuing anyway.\n");
             status = false;