Changeset 8807

Timestamp:

Sep 13, 2006, 9:22:32 AM (20 years ago)

Author:

rhl

Message:

return error if APTREND has unknown value

File:

• trunk/psphot/src/psphotApResid.c (modified) (8 diffs)

trunk/psphot/src/psphotApResid.c

@@ -124 +124 @@
             return false;
         }
-    }
-
-    // constant and skybias only
-    if (!strcasecmp (ApTrendOption, "SKYBIAS")) {
+    } else if (!strcasecmp (ApTrendOption, "SKYBIAS")) { // constant and skybias only
         // first clip out objects which are too far from the median 
         stats->clipIter = 2;
@@ -145 +142 @@
             return false;
         }
-    }
-
-    if (!strcasecmp (ApTrendOption, "SKYSAT")) {
+    } else if (!strcasecmp (ApTrendOption, "SKYSAT")) {
         // first clip out objects which are too far from the median 
         stats->clipIter = 2;
@@ -174 +169 @@
             return false;
         }
-    }
-
-    // constant and linear X,Y only
-    if (!strcasecmp (ApTrendOption, "XY_LIN")) {
+    } else if (!strcasecmp (ApTrendOption, "XY_LIN")) { // constant and linear X,Y only
         // first clip out objects which are too far from the median 
         stats->clipIter = 2;
@@ -195 +187 @@
             return false;
         }
-    }
-
-    // constant and quadratic X,Y only
-    if (!strcasecmp (ApTrendOption, "XY_QUAD")) {
+    } else if (!strcasecmp (ApTrendOption, "XY_QUAD")) { // constant and quadratic X,Y only
         // first clip out objects which are too far from the median 
         stats->clipIter = 2;
@@ -216 +205 @@
             return false;
         }
-    }
-
-     // constant and sky, linear X,Y only
-    if (!strcasecmp (ApTrendOption, "SKY_XY_LIN")) {
+    } else if (!strcasecmp (ApTrendOption, "SKY_XY_LIN")) { // constant and sky, linear X,Y only
         // first clip out objects which are too far from the median 
         stats->clipIter = 2;
@@ -237 +223 @@
             return false;
         }
-    }
-
-     // constant and sky, linear X,Y only
-    if (!strcasecmp (ApTrendOption, "SKYSAT_XY_LIN")) {
+    } else if (!strcasecmp (ApTrendOption, "SKYSAT_XY_LIN")) { // constant and sky, linear X,Y only
         // first clip out objects which are too far from the median 
         stats->clipIter = 2;
@@ -267 +250 @@
             return false;
         }
-    }
-
-    if (!strcasecmp (ApTrendOption, "ALL")) {
+    } else if (!strcasecmp (ApTrendOption, "ALL")) {
         // first clip out objects which are too far from the median 
         stats->clipIter = 2;
@@ -296 +277 @@
             return false;
         }
+    } else {
+        psError(PSPHOT_ERR_PHOTOM, true, "Unknown APTREND value: %s", ApTrendOption);
+        return false;
     }