Changeset 6325 for trunk/psModules/src/imcombine/pmReadoutCombine.c

Timestamp:

Feb 6, 2006, 11:03:25 AM (20 years ago)

Author:

gusciora

Message:

These changes mostly reflect the new psStats SDRS changes.

However, pmObject.c will fail any real test because the call
to psMinimizeLMM() was commented out due to SDRS changes there.

File:

• trunk/psModules/src/imcombine/pmReadoutCombine.c (modified) (4 diffs)

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:19:25 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -410 +410 @@
     psRegion minRegion;
     psRegion maxRegion;
-    psStats *minStats = psStatsAlloc(PS_STAT_ROBUST_MEAN);
-    psStats *maxStats = psStatsAlloc(PS_STAT_ROBUST_MEAN);
+    psStats *minStats = psStatsAlloc(PS_STAT_FITTED_MEAN);
+    psStats *maxStats = psStatsAlloc(PS_STAT_FITTED_MEAN);
     psStats *diffStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN);
     psVector *diffs = psVectorAlloc(fringePoints->n, PS_TYPE_F32);
@@ -445 +445 @@
         }
 
-        fp->midValue = 0.5 * (maxStats->robustMean + minStats->robustMean);
-        fp->delta = maxStats->robustMean - minStats->robustMean;
+        fp->midValue = 0.5 * (maxStats->fittedMean + minStats->fittedMean);
+        fp->delta = maxStats->fittedMean - minStats->fittedMean;
         diffs->data.F32[i] = fp->delta;
     }
@@ -455 +455 @@
     psFree(diffs);
     if (diffStats == NULL) {
-        psError(PS_ERR_UNKNOWN, true, "Could not determine robust median of the differences.\n");
+        psError(PS_ERR_UNKNOWN, true, "Could not determine fitted median of the differences.\n");
         return(NULL);
     }