Changeset 6325 for trunk/psModules/src/imsubtract

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.

Location:

trunk/psModules/src/imsubtract

Files:

• pmSubtractBias.c (modified) (3 diffs)
• pmSubtractSky.c (modified) (2 diffs)

trunk/psModules/src/imsubtract/pmSubtractBias.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:10:51 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -179 +179 @@
     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_MODE) {
+            if (numOptions == 0) {
+                opt = PS_STAT_ROBUST_MODE;
+            }
+            numOptions++;
+        }
+    */
     if (stat->options & PS_STAT_ROBUST_MEDIAN) {
         if (numOptions == 0) {
@@ -193 +194 @@
     }
 
-    if (stat->options & PS_STAT_ROBUST_MEAN) {
+    if (stat->options & PS_STAT_FITTED_MEAN) {
         if (numOptions == 0) {
-            opt = PS_STAT_ROBUST_MEAN;
+            opt = PS_STAT_FITTED_MEAN;
         }
         numOptions++;

trunk/psModules/src/imsubtract/pmSubtractSky.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-15 20:09:03 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-06 21:03:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -67 +67 @@
     } else if (statOptions & PS_STAT_CLIPPED_MEAN) {
         return(PS_STAT_CLIPPED_MEAN);
-    } else if (statOptions & PS_STAT_ROBUST_MEAN) {
-        return(PS_STAT_ROBUST_MEAN);
+    } else if (statOptions & PS_STAT_FITTED_MEAN) {
+        return(PS_STAT_FITTED_MEAN);
     } else if (statOptions & PS_STAT_ROBUST_MEDIAN) {
         return(PS_STAT_ROBUST_MEDIAN);
-    } else if (statOptions & PS_STAT_ROBUST_MODE) {
-        return(PS_STAT_ROBUST_MODE);
     }
     psError(PS_ERR_UNKNOWN, true, "Unallowable option requested for statistically binning image pixels.\n");
     return(-1);
+    // XXX
+    //else if (statOptions & PS_STAT_ROBUST_MODE) {
+    //    return(PS_STAT_ROBUST_MODE);
+    //}
 }