Changeset 17811

Timestamp:

May 24, 2008, 1:24:15 PM (18 years ago)

Author:

Paul Price

Message:

Fixing log messages.

File:

• trunk/psModules/src/imcombine/pmSubtraction.c (modified) (5 diffs)

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.91 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-05-24 00:40:16 $
+ *  @version $Revision: 1.92 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-05-24 23:24:15 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -493 +493 @@
 
 
-int pmSubtractionRejectStamps(float *rms, int *num, pmSubtractionStampList *stamps,
+int pmSubtractionRejectStamps(float *rmsPtr, int *numPtr, pmSubtractionStampList *stamps,
                               const psVector *deviations, psImage *subMask, float sigmaRej,
                               int footprint)
@@ -514 +514 @@
     }
 
-    totalSquareDev = sqrt(totalSquareDev / (double)numStamps); // Convert to RMS
-
-    if (rms) {
-        *rms = totalSquareDev;
-    }
-    if (num) {
-        *num = numStamps;
+    float rms = sqrt(totalSquareDev / (double)numStamps); // Convert to RMS
+
+    if (rmsPtr) {
+        *rmsPtr = rms;
+    }
+    if (numPtr) {
+        *numPtr = numStamps;
     }
 
@@ -531 +531 @@
         // User just wanted to calculate and record the RMS for posterity
         psLogMsg("psModules.imcombine", PS_LOG_INFO, "RMS deviation from %d stamps: %lf",
-                 numStamps, totalSquareDev);
+                 numStamps, rms);
         return 0;
     }
 
-    float limit = sigmaRej * totalSquareDev; // Limit on maximum deviation
+    float limit = sigmaRej * rms; // Limit on maximum deviation
     psTrace("psModules.imcombine", 1, "Deviation limit: %f\n", limit);
 
@@ -586 +586 @@
         psLogMsg("psModules.imcombine", PS_LOG_INFO,
                  "%d good stamps; %d rejected.\nRMS deviation: %f --> %f\n",
-                 numGood, numRejected, sqrt(totalSquareDev / numStamps),
+                 numGood, numRejected, rms,
                  sqrt(newSquareDev / (double)numGood));
     } else {
         psLogMsg("psModules.imcombine", PS_LOG_INFO,
                  "%d good stamps; 0 rejected.\nRMS deviation: %f\n",
-                 numGood, sqrt(totalSquareDev / numStamps));
+                 numGood, rms);
     }