Changeset 20180 for trunk/dvoTools/src/dvoMakeCorrParseCamera.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/dvoMakeCorrParseCamera.c (modified) (3 diffs)

trunk/dvoTools/src/dvoMakeCorrParseCamera.c

@@ -7 +7 @@
 dvoMakeCorrOptions *dvoMakeCorrParseCamera (pmConfig *config) {
 
+    // the REFERENCE image defines the camera, and all recipes and options the follow
+    pmFPAfile *refhead = pmFPAfileDefineFromArgs (NULL, config, "DVOCORR.REFHEAD", "REFHEAD");
+    if (!refhead) {
+        psError(PS_ERR_IO, false, "Failed to build FPA from DVOCORR.REFHEAD");
+        return NULL;
+    }
+
     // the input image defines the camera, and all recipes and options the follow
     pmFPAfile *input = pmFPAfileDefineFromArgs (NULL, config, "DVOCORR.INPUT", "INPUT");
     if (!input) {
         psError(PS_ERR_IO, false, "Failed to build FPA from DVOCORR.INPUT");
-        return NULL;
-    }
-
-    // the input image defines the camera, and all recipes and options the follow
-    pmFPAfile *refhead = pmFPAfileDefineFromArgs (NULL, config, "DVOCORR.REFHEAD", "REFHEAD");
-    if (!refhead) {
-        psError(PS_ERR_IO, false, "Failed to build FPA from DVOCORR.REFHEAD");
         return NULL;
     }
@@ -29 +29 @@
     // the following files are output targets
     // XXX get the binning from where?
-    pmFPAfile *output = pmFPAfileDefineFromFPA(config, input->fpa, 1, 1, "DVOCORR.OUTPUT");
+    pmFPAfile *output = pmFPAfileDefineFromFPA(config, refhead->fpa, 1, 1, "DVOCORR.OUTPUT");
     if (!output) {
         psError(PS_ERR_IO, false, _("Unable to generate output file from DVOCORR.OUTPUT"));
@@ -35 +35 @@
         return NULL;
     }
+    output->save = TRUE;
 
     // Chip selection: turn on only the chips specified (pass status to suppress missing-key log msg)