Changeset 17783 for trunk/psModules/src/imcombine/pmSubtraction.c

Timestamp:

May 23, 2008, 2:40:16 PM (18 years ago)

Author:

Paul Price

Message:

Adding additional analysis metadata.

File:

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

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.90 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-05-01 19:20:51 $
+ *  @version $Revision: 1.91 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-05-24 00:40:16 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -493 +493 @@
 
 
-int pmSubtractionRejectStamps(pmSubtractionStampList *stamps, const psVector *deviations,
-                              psImage *subMask, float sigmaRej, int footprint)
+int pmSubtractionRejectStamps(float *rms, int *num, pmSubtractionStampList *stamps,
+                              const psVector *deviations, psImage *subMask, float sigmaRej,
+                              int footprint)
 {
     PM_ASSERT_SUBTRACTION_STAMP_LIST_NON_NULL(stamps, -1);
@@ -513 +514 @@
     }
 
+    totalSquareDev = sqrt(totalSquareDev / (double)numStamps); // Convert to RMS
+
+    if (rms) {
+        *rms = totalSquareDev;
+    }
+    if (num) {
+        *num = numStamps;
+    }
+
     if (numStamps == 0) {
         psError(PS_ERR_UNKNOWN, true, "No good stamps found.");
@@ -520 +530 @@
     if (!isfinite(sigmaRej) || sigmaRej <= 0.0) {
         // User just wanted to calculate and record the RMS for posterity
-        psLogMsg("psModules.imcombine", PS_LOG_INFO, "RMS deviation: %f", sqrt(totalSquareDev / numStamps));
+        psLogMsg("psModules.imcombine", PS_LOG_INFO, "RMS deviation from %d stamps: %lf",
+                 numStamps, totalSquareDev);
         return 0;
     }
 
-    float limit = sigmaRej * sqrt(totalSquareDev / (double)numStamps); // Limit on maximum deviation
+    float limit = sigmaRej * totalSquareDev; // Limit on maximum deviation
     psTrace("psModules.imcombine", 1, "Deviation limit: %f\n", limit);