Changeset 10406

Timestamp:

Dec 1, 2006, 2:51:56 PM (20 years ago)

Author:

Paul Price

Message:

Propagating API change to psImageBackground

Location:

trunk/psModules/src

Files:

• camera/pmFPA_JPEG.c (modified) (2 diffs)
• detrend/pmMaskBadPixels.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPA_JPEG.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-24 20:54:09 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-02 00:51:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -131 +131 @@
     // XXX we need to decide where the scale will come from in the long term
     psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS, 0);
-    psStats *stats = psImageBackground(readout->image, NULL, 0, 0.25, 0.75, 10000, PS_STAT_ROBUST_MEDIAN, rng);
+    psStats *stats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_QUARTILE);
+    stats->nSubsample = 10000;
+    if (!psImageBackground(stats, readout->image, NULL, 0, rng)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to write JPEG of readout.\n");
+        psFree(rng);
+        psFree(stats);
+        return false;
+    }
     psFree(rng);
 

trunk/psModules/src/detrend/pmMaskBadPixels.c

@@ -120 +120 @@
 
     // XXX note that this now will accept any of several stats options
-    psStats *stats = psImageBackground(image, mask, maskVal, 0.25, 0.75,
-                                       frac * image->numCols * image->numRows, PS_STAT_ROBUST_MEDIAN, rng); // Image statistics
-    if (!stats || !isfinite(stats->robustMedian) || !isfinite(stats->robustUQ) ||
-            !isfinite(stats->robustLQ)) {
+    psStats *stats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_QUARTILE);
+    stats->nSubsample = frac * image->numCols * image->numRows;
+    if (!psImageBackground(stats, image, mask, maskVal, rng) ||
+            !isfinite(stats->robustMedian) || !isfinite(stats->robustUQ) || !isfinite(stats->robustLQ)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to measure image statistics.\n");
         psFree(stats);