Changeset 28484 for branches/pap/psModules/src/detrend/pmShutterCorrection.c

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/detrend/pmShutterCorrection.c (modified) (3 diffs)

branches/pap/psModules/src/detrend/pmShutterCorrection.c

@@ -351 +351 @@
     psStats *resStats = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN | PS_STAT_SAMPLE_STDEV);
     if (!psVectorStats (rawStats, counts, NULL, NULL, 0)) {
-        psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
-        return NULL;
+        psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+        return NULL;
     }
     if (!psVectorStats (resStats, resid, NULL, NULL, 0)) {
-        psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
-        return NULL;
+        psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+        return NULL;
     }
 
@@ -794 +794 @@
 
                 if (!psThreadJobAddPending(job)) {
-                    psFree(job);
                     return false;
                 }
-                psFree(job);
             } else if (!pmShutterCorrectionApplyScan(image, mask, var, shutterImage, exptime, blank,
                                                      rowStart, rowStop)) {
@@ -1017 +1015 @@
 
         if (corr) {
-            psTrace("psModules.detrend", 5, "Shutter correction fit: scale: %f, offset: %f, offref: %f\n", corr->scale, corr->offset, corr->offref);
-            if (isfinite(corr->offref) && corr->valid) {
-                psTrace("psModules.detrend", 5, "Sample reference value: %f\n", corr->offref);
-                meanRef += corr->offref;
-                numGood++;
-            }
+            psTrace("psModules.detrend", 5, "Shutter correction fit: scale: %f, offset: %f, offref: %f\n", corr->scale, corr->offset, corr->offref);
+            if (isfinite(corr->offref) && corr->valid) {
+                psTrace("psModules.detrend", 5, "Sample reference value: %f\n", corr->offref);
+                meanRef += corr->offref;
+                numGood++;
+            }
         } else {
-            psTrace("psModules.detrend", 5, "failed Shutter correction fit\n");
-        }
+            psTrace("psModules.detrend", 5, "failed Shutter correction fit\n");
+        }
 
         psFree(corr);