Changeset 31091 for branches/eam_branches/ipp-20110213/psModules/src/detrend/pmDetrendDB.c

Timestamp:

Mar 30, 2011, 9:42:02 AM (15 years ago)

Author:

eugene

Message:

merging changes from trunk

File:

• branches/eam_branches/ipp-20110213/psModules/src/detrend/pmDetrendDB.c (modified) (4 diffs)

branches/eam_branches/ipp-20110213/psModules/src/detrend/pmDetrendDB.c

@@ -7 +7 @@
 #include <pslib.h>
 
+#include "pmErrorCodes.h"
 #include "pmConfig.h"
 #include "pmConfigCommand.h"
@@ -120 +121 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
+    psIOBuffer *buffer = NULL;
+    psPipe *pipe = NULL;
+    psMetadata *answer = NULL;
+
     int status, exit_status;
     psString line = NULL;
@@ -137 +142 @@
     psFree (realCamera);
 
+    // require a filter for certain types of detrends:
+    if ((options->type == PM_DETREND_TYPE_FLAT) && !options->filter) {
+        psError (PM_ERR_CONFIG, false, "requesting a FLAT-class of detrend without a filter");
+        goto failure;
+    }
+    if ((options->type == PM_DETREND_TYPE_FLATCORR) && !options->filter) {
+        psError (PM_ERR_CONFIG, false, "requesting a FLATCORR-class of detrend without a filter");
+        goto failure;
+    }
+    if ((options->type == PM_DETREND_TYPE_FRINGE) && !options->filter) {
+        psError (PM_ERR_CONFIG, false, "requesting a FRINGE-class of detrend without a filter");
+        goto failure;
+    }
+
+    // add the restrictions
     if (options->filter) {
         psStringAppend(&line, " -filter %s", options->filter);
@@ -155 +175 @@
         psStringAppend(&line, " -airmass %f", options->twilight);
     }
-
-    psIOBuffer *buffer = NULL;
-    psPipe *pipe = NULL;
-    psMetadata *answer = NULL;
 
     if (!pmConfigDatabaseCommand(&line, config)) {