Changeset 14779

Timestamp:

Sep 7, 2007, 10:27:18 AM (19 years ago)

Author:

magnier

Message:

modified psImageBackground API

Location:

branches/eam_branch_20070830/psModules/src

Files:

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

branches/eam_branch_20070830/psModules/src/camera/pmFPA_JPEG.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-05-05 02:37:02 $
+ *  @version $Revision: 1.22.10.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-07 20:27:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -161 +161 @@
     psStats *stats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN);
     stats->nSubsample = 10000;
-    if (!psImageBackground(stats, readout->image, NULL, 0, rng)) {
+    if (!psImageBackground(stats, NULL, readout->image, NULL, 0, rng)) {
         psStats *statsAlt = psStatsAlloc(PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV);
         stats->nSubsample = 10000;
-        if (!psImageBackground(stats, readout->image, NULL, 0, rng)) {
+        if (!psImageBackground(stats, NULL, readout->image, NULL, 0, rng)) {
             psLogMsg("jpeg", PS_LOG_WARN, "Unable to measure statistics for image, writing blank jpeg\n");
             mean = 0;

branches/eam_branch_20070830/psModules/src/detrend/pmMaskBadPixels.c

@@ -112 +112 @@
     psStats *stats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV);
     stats->nSubsample = frac * image->numCols * image->numRows;
-    if (!psImageBackground(stats, image, mask, maskVal, rng) ||
+    if (!psImageBackground(stats, NULL, image, mask, maskVal, rng) ||
             !isfinite(stats->robustMedian) || !isfinite(stats->robustUQ) || !isfinite(stats->robustLQ)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to measure image statistics.\n");

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

@@ -811 +811 @@
         psMemIncrRefCounter(rng);
     }
-    if (!psImageBackground(stats, readout->image, readout->mask, maskVal, rng)) {
+    if (!psImageBackground(stats, NULL, readout->image, readout->mask, maskVal, rng)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to measure reference statistics.\n");
         psFree(stats);