Changeset 8004 for trunk/psModules/src/detrend

Timestamp:

Jul 27, 2006, 5:21:19 PM (20 years ago)

Author:

Paul Price

Message:

Changing p_psGetStatsValue over to psStatsSingleOption and psStatsGetValue

Location:

trunk/psModules/src/detrend

Files:

• pmSubtractBias.c (modified) (9 diffs)
• pmSubtractSky.c (modified) (7 diffs)

trunk/psModules/src/detrend/pmSubtractBias.c

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-28 03:21:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -165 +165 @@
 }
 
-
-/******************************************************************************
-GenNewStatOptions(): this routine will take as input the options member of the
-stat data structure, determine if multiple options have been specified, issue
-a warning message if so, and return the highest priority option (according to
-the order of the if-statements in this code).  The higher priority options are
-listed lower in the code.
- *****************************************************************************/
-static psStatsOptions GenNewStatOptions(const psStats *stat)
-{
-    assert(stat);
-
-    psS32 numOptions = 0;
-    psStatsOptions opt = 0;
-
-    if (stat->options & PS_STAT_ROBUST_MEDIAN) {
-        if (numOptions == 0) {
-            opt = PS_STAT_ROBUST_MEDIAN;
-        }
-        numOptions++;
-    }
-
-    if (stat->options & PS_STAT_CLIPPED_MEAN) {
-        if (numOptions == 0) {
-            opt = PS_STAT_CLIPPED_MEAN;
-        }
-        numOptions++;
-    }
-
-    if (stat->options & PS_STAT_SAMPLE_MEDIAN) {
-        if (numOptions == 0) {
-            opt = PS_STAT_SAMPLE_MEDIAN;
-        }
-        numOptions++;
-    }
-
-    if (stat->options & PS_STAT_SAMPLE_MEAN) {
-        numOptions++;
-        opt = PS_STAT_SAMPLE_MEAN;
-    }
-
-
-    if (numOptions == 0) {
-        psError(PS_ERR_UNKNOWN,true, "No statistics options have been specified.\n");
-    }
-    if (numOptions != 1) {
-        psLogMsg(__func__, PS_LOG_WARN,
-                 "WARNING: pmSubtractBias.c: GenNewStatOptions(): Too many statistics options "
-                 "have been specified\n");
-    }
-    return opt;
-}
-
-
 // Produce an overscan vector from an array of pixels
 static psVector *overscanVector(pmOverscanOptions *overscanOpts, // Overscan options
@@ -228 +174 @@
     assert(pixels);
     assert(myStats);
+
+    psStatsOptions statistic = psStatsSingleOption(myStats->options); // Statistic to use
+    assert(statistic != 0);
 
     // Reduce the overscans
@@ -241 +190 @@
             ordinate->data.F32[i] = 2.0*(float)i/(float)pixels->n - 1.0; // Scale to [-1,1]
             psVectorStats(myStats, values, NULL, NULL, 0);
-            double reducedVal = NAN; // Result of statistics
-            if (! p_psGetStatValue(myStats, &reducedVal)) {
-                psError(PS_ERR_UNKNOWN, false, "p_psGetStatValue(): could not determine result "
-                        "of statistics on row %d.\n", i);
-                return NULL;
-            }
-            reduced->data.F32[i] = reducedVal;
+            reduced->data.F32[i] = psStatsGetValue(myStats, statistic);
         } else if (overscanOpts->fitType == PM_FIT_NONE) {
             psError(PS_ERR_UNKNOWN, true, "The overscan is not supplied for all points on the "
@@ -344 +287 @@
         psList *overscans = in->bias; // List of the overscan images
 
-        psStats *myStats = psStatsAlloc(PS_STAT_SAMPLE_MEAN); // A new psStats, to avoid clobbering original
-        myStats->options = GenNewStatOptions(overscanOpts->stat);
+        psStatsOptions statistic = psStatsSingleOption(overscanOpts->stat->options); // Statistic to use
+        if (statistic == 0) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Multiple or no statistics options set: %x\n",
+                    overscanOpts->stat);
+            return false;
+        }
+        psStats *stats = psStatsAlloc(statistic); // A new psStats, to avoid clobbering original
 
         // Reduce all overscan pixels to a single value
@@ -365 +313 @@
             psFree(iter);
 
-            (void)psVectorStats(myStats, pixels, NULL, NULL, 0);
-            double reduced = NAN;     // Result of statistics
-            if (! p_psGetStatValue(myStats, &reduced)) {
-                psError(PS_ERR_UNKNOWN, false, "p_psGetStatValue(): could not determine result from requested statistical operation.  Returning input image.\n");
-                return false;
-            }
+            (void)psVectorStats(stats, pixels, NULL, NULL, 0);
+            double reduced = psStatsGetValue(stats, statistic); // Result of statistics
             (void)psBinaryOp(image, image, "-", psScalarAlloc((float)reduced, PS_TYPE_F32));
         } else {
@@ -408 +352 @@
 
                 // Reduce the overscans
-                psVector *reduced = overscanVector(overscanOpts, pixels, myStats);
+                psVector *reduced = overscanVector(overscanOpts, pixels, stats);
                 psFree(pixels);
                 if (! reduced) {
@@ -452 +396 @@
 
                 // Reduce the overscans
-                psVector *reduced = overscanVector(overscanOpts, pixels, myStats);
+                psVector *reduced = overscanVector(overscanOpts, pixels, stats);
                 psFree(pixels);
                 if (! reduced) {
@@ -467 +411 @@
             }
         }
-        psFree(myStats);
+        psFree(stats);
     } // End of overscan subtraction
 

trunk/psModules/src/detrend/pmSubtractSky.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 23:59:49 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-28 03:21:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -90 +90 @@
 requirements change and we might need a custom reBin function.
  *****************************************************************************/
-/*
+#if 0
 static psImage *binImage(psImage *origImage,
                          int binFactor,
@@ -96 +96 @@
 {
     psTrace("SubtractSky.binImage", 4, "Calling binImage(%d)\n", binFactor);
- 
+
     if (binFactor <= 0) {
         psLogMsg(__func__, PS_LOG_WARN,
@@ -105 +105 @@
         return(origImage);
     }
- 
+
     psVector *binVector = psVectorAlloc(binFactor * binFactor, PS_TYPE_F32);
     psVector *binMask = psVectorAlloc(binFactor * binFactor, PS_TYPE_U8);
     psStats *myStats = psStatsAlloc(statOptions);
- 
+
     for (psS32 row = 0; row < origImage->numRows ; row+=binFactor) {
         for (psS32 col = 0; col < origImage->numCols ; col+=binFactor) {
@@ -134 +134 @@
             psF64 statValue;
             psBool rc = p_psGetStatValue(rc1, &statValue);
- 
+
             if (rc == true) {
                 origImage->data.F32[row][col] = (psF32) statValue;
@@ -147 +147 @@
     psFree(binMask);
     psFree(myStats);
- 
+
     psTrace("SubtractSky.binImage", 4, "Exiting binImage(%d)\n", binFactor);
     return(origImage);
 }
-*/
+#endif
 
 /******************************************************************************
@@ -601 +601 @@
     } else {
         // Determine the mean and standard deviation of the binned image.
-        psF64 binnedMean;
-        psF64 binnedStdev;
-        psStats *myStats = psStatsAlloc(PS_STAT_SAMPLE_MEAN);
-        psStats *rc =  psImageStats(myStats, binnedImage, NULL, 0);
-        if (rc == NULL) {
-            psError(PS_ERR_UNKNOWN, false, "psImageStats(): could not perform requested statistical operation.  Returning in image.\n");
-            return(in);
-        }
-        if (false == p_psGetStatValue(rc, &binnedMean)) {
-            psError(PS_ERR_UNKNOWN, false, "p_psGetStatValue(): could not determine requested statistical operation.  Returning in image.\n");
-            return(in);
-        }
-        psTrace(".psModule.pmSubtractSky", 6,
-                "binned Mean is %f\n", binnedMean);
-
-        myStats->options = PS_STAT_SAMPLE_STDEV;
-        rc =  psImageStats(myStats, binnedImage, NULL, 0);
-        if (rc == NULL) {
-            psError(PS_ERR_UNKNOWN, false, "psImageStats(): could not perform requested statistical operation.  Returning in image.\n");
-            return(in);
-        }
-        if (false == p_psGetStatValue(myStats, &binnedStdev)) {
-            psError(PS_ERR_UNKNOWN, false, "p_psGetStatValue(): could not determine requested statistical operation.  Returning in image.\n");
-            return(in);
-        }
+        psStats *myStats = psStatsAlloc(PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV);
+        if (!psImageStats(myStats, binnedImage, NULL, 0)) {
+            psError(PS_ERR_UNEXPECTED_NULL, false, "Couldn't get statistics for image.\n");
+            return NULL;
+        }
+        psF64 binnedMean = myStats->sampleMean;
+        psF64 binnedStdev = myStats->sampleStdev;
         psFree(myStats);
         psTrace(".psModule.pmSubtractSky", 6,