Changeset 20180 for trunk/dvoTools/src/dvoApplyCorrParseCamera.c

Timestamp:

Oct 15, 2008, 5:51:49 PM (18 years ago)

Author:

eugene

Message:

extensive fixes to make these two programs actually work

File:

• trunk/dvoTools/src/dvoApplyCorrParseCamera.c (modified) (4 diffs)

trunk/dvoTools/src/dvoApplyCorrParseCamera.c

@@ -4 +4 @@
 
 # include "dvoApplyCorr.h"
+bool dvoApplyCorrSelectCorrFile (pmConfig *config, pmFPA *input);
 
 dvoApplyCorrOptions *dvoApplyCorrParseCamera (pmConfig *config) {
@@ -29 +30 @@
         return NULL;
     }
+    output->save = TRUE;
 
     // find the flat-field correction image (from command-line, config file, or detrend db)
-    status = false;
-    pmFPAfileDefineFromArgs  (&status, config, "DVOFLAT.CORR", "CORR");
-    psErrorClear();
-    pmFPAfileDefineFromConf  (&status, config, "DVOFLAT.CORR");
-    psErrorClear();
-    pmFPAfileDefineFromDetDB (&status, config, "DVOFLAT.CORR", input->fpa, PM_DETREND_TYPE_FLAT_CORRECTION);
+    status = dvoApplyCorrSelectCorrFile (config, input->fpa);
     if (!status) {
         psError (PS_ERR_IO, false, "can't find a flat-field correction image source");
@@ -52 +49 @@
             if (! pmFPASelectChip(output->fpa, chipNum, false)) {
                 psError(PS_ERR_IO, false, "Chip number %d doesn't exist in camera.\n", chipNum);
-                return false;
+                return NULL;
             }
         }
@@ -59 +56 @@
     return (options);
 }
+
+bool dvoApplyCorrSelectCorrFile (pmConfig *config, pmFPA *input) {
+
+    bool status;
+    pmFPAfile *file = NULL;
+
+    file = pmFPAfileDefineFromArgs  (&status, config, "DVOFLAT.CORR", "CORR");
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load file definition");
+        return false;
+    }
+    if (file) {
+        if (file->type != PM_FPA_FILE_IMAGE) {
+            psError(PS_ERR_IO, true, "DVOFLAT.CORR is not of type IMAGE");
+            return false;
+        }
+        return true;
+    }
+
+    file = pmFPAfileDefineFromConf  (&status, config, "DVOFLAT.CORR");
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load file definition");
+        return false;
+    }
+    if (file) {
+        if (file->type != PM_FPA_FILE_IMAGE) {
+            psError(PS_ERR_IO, true, "DVOFLAT.CORR is not of type IMAGE");
+            return false;
+        }
+        return true;
+    }
+
+    file = pmFPAfileDefineFromDetDB (&status, config, "DVOFLAT.CORR", input, PM_DETREND_TYPE_FLAT_CORRECTION);
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load file definition");
+        return false;
+    }
+    if (file) {
+        if (file->type != PM_FPA_FILE_IMAGE) {
+            psError(PS_ERR_IO, true, "DVOFLAT.CORR is not of type IMAGE");
+            return false;
+        }
+        return true;
+    }
+    return false;
+}