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

Timestamp:

Feb 16, 2007, 1:46:31 PM (19 years ago)

Author:

eugene

Message:

fixed up basic operations

File:

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

trunk/dvoTools/src/dvoApplyCorrParseCamera.c

@@ -10 +10 @@
 
     // the input image defines the camera, and all recipes and options the follow
-    // XXX we need to change this: mosaic.fits is not in pmFPA format??
-    // - determine the camera from the header keywords
-    pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "DVOCORR.INPUT", "INPUT");
-    if (!status || !input) {
-        psError(PS_ERR_IO, false, "Failed to build FPA from DVOCORR.INPUT");
+    pmFPAfile *input = pmFPAfileDefineFromArgs (NULL, config, "DVOFLAT.INPUT", "INPUT");
+    if (!input) {
+        psError(PS_ERR_IO, false, "Failed to build FPA from DVOFLAT.INPUT");
         return NULL;
     }
@@ -25 +23 @@
 
     // the following files are output targets
-    pmFPAfile *output = pmFPAfileDefineOutput(config, input->fpa, "DVOCORR.OUTPUT");
+    pmFPAfile *output = pmFPAfileDefineOutput(config, input->fpa, "DVOFLAT.OUTPUT");
     if (!output) {
-        psError(PS_ERR_IO, false, _("Unable to generate output file from DVOCORR.OUTPUT"));
+        psError(PS_ERR_IO, false, _("Unable to generate output file from DVOFLAT.OUTPUT"));
         psFree(options);
         return NULL;
     }
 
+    // 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);
+    if (!status) {
+        psError (PS_ERR_IO, false, "can't find a flat-field correction image source");
+        return NULL;
+    }
+    
     // Chip selection: turn on only the chips specified (pass status to suppress missing-key log msg)
+    status = false;
     char *chipLine = psMetadataLookupStr(&status, config->arguments, "CHIP_SELECTIONS");
     psArray *chips = psStringSplitArray (chipLine, ",", false);