Changeset 6438

Timestamp:

Feb 16, 2006, 4:47:35 PM (20 years ago)

Author:

magnier

Message:

fixed ROBUST_MEDIAN entries

Location:

branches/eam_rel9_p0/psModules/src

Files:

• imcombine/pmReadoutCombine.c (modified) (3 diffs)
• imsubtract/pmSubtractBias.c (modified) (4 diffs)

branches/eam_rel9_p0/psModules/src/imcombine/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2.10.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-15 18:20:03 $
+ *  @version $Revision: 1.2.10.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-17 02:47:26 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -682 +682 @@
     psRegion minRegion;
     psRegion maxRegion;
-    psStats *minStats = psStatsAlloc(PS_STAT_ROBUST_MEAN);
-    psStats *maxStats = psStatsAlloc(PS_STAT_ROBUST_MEAN);
+    psStats *minStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN);
+    psStats *maxStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN);
     psStats *diffStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN);
     psVector *diffs = psVectorAlloc(fringePoints->n, PS_TYPE_F32);
@@ -717 +717 @@
         }
 
-        fp->midValue = 0.5 * (maxStats->robustMean + minStats->robustMean);
-        fp->delta = maxStats->robustMean - minStats->robustMean;
+        fp->midValue = 0.5 * (maxStats->robustMedian + minStats->robustMedian);
+        fp->delta = maxStats->robustMedian - minStats->robustMedian;
         diffs->data.F32[i] = fp->delta;
     }

branches/eam_rel9_p0/psModules/src/imsubtract/pmSubtractBias.c

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.6.8.1.2.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-08 23:02:02 $
+ *  @version $Revision: 1.6.8.1.2.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-17 02:47:35 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -178 +178 @@
     psStatsOptions opt = 0;
 
-    if (stat->options & PS_STAT_ROBUST_MODE) {
-        if (numOptions == 0) {
-            opt = PS_STAT_ROBUST_MODE;
-        }
-        numOptions++;
-    }
-
     if (stat->options & PS_STAT_ROBUST_MEDIAN) {
         if (numOptions == 0) {
             opt = PS_STAT_ROBUST_MEDIAN;
-        }
-        numOptions++;
-    }
-
-    if (stat->options & PS_STAT_ROBUST_MEAN) {
-        if (numOptions == 0) {
-            opt = PS_STAT_ROBUST_MEAN;
         }
         numOptions++;
@@ -382 +368 @@
         }
         if (! overscanOpts->poly) {
-            overscanOpts->poly = psPolynomial1DAlloc(overscanOpts->order, PS_POLYNOMIAL_ORD);
+            overscanOpts->poly = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, overscanOpts->order);
         }
         psVectorFitPolynomial1D(overscanOpts->poly, mask, 1, reduced, NULL, ordinate);
@@ -395 +381 @@
         }
         if (! overscanOpts->poly) {
-            overscanOpts->poly = psPolynomial1DAlloc(overscanOpts->order, PS_POLYNOMIAL_CHEB);
+            overscanOpts->poly = psPolynomial1DAlloc(PS_POLYNOMIAL_CHEB, overscanOpts->order);
         }
         psVectorFitPolynomial1D(overscanOpts->poly, mask, 1, reduced, NULL, ordinate);