Changeset 25027 for branches/pap/ppSub/src/ppSubLoop.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ppSub (modified) (1 prop)
• ppSub/src/ppSubLoop.c (modified) (2 diffs)

branches/pap/ppSub/src/ppSubLoop.c

@@ -65 +65 @@
     }
 
+    if (!ppSubLowThreshold(data)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to threshold images.");
+        return false;
+    }
+
     // Set up subtraction files
     if (!ppSubFilesIterateDown(config, PPSUB_FILES_SUB)) {
@@ -95 +100 @@
     if (!ppSubBackground(config)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to subtract background.");
+        return false;
+    }
+
+    // Perform Variance correction (rescale within a modest range)
+    if (!ppSubVarianceRescale(config)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to rescale variance.");
         return false;
     }