Changeset 11862 for trunk/dvoTools

Timestamp:

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

Author:

eugene

Message:

fixed up basic operations

Location:

trunk/dvoTools/src

Files:

• Makefile.am (modified) (1 diff)
• dvoApplyCorr.h (modified) (1 diff)
• dvoApplyCorrArguments.c (modified) (3 diffs)
• dvoApplyCorrLoop.c (modified) (2 diffs)
• dvoApplyCorrParseCamera.c (modified) (2 diffs)
• dvoApplyCorrReadout.c (added)

trunk/dvoTools/src/Makefile.am

@@ -24 +24 @@
         dvoApplyCorrParseCamera.c \
         dvoApplyCorrLoop.c \
+        dvoApplyCorrReadout.c \
         dvoApplyCorrCleanup.c \
         dvoApplyCorrOptions.c \

trunk/dvoTools/src/dvoApplyCorr.h

@@ -31 +31 @@
 bool dvoApplyCorrLoop(pmConfig *config, dvoApplyCorrOptions *options);
 
+// apply the correction factor pixel-by-pixel
+bool dvoApplyCorrReadout (pmConfig *config, pmFPAview *view, char *inName, char *corrName);
+
 // free memory, check for leaks
 void dvoApplyCorrCleanup (pmConfig *config, dvoApplyCorrOptions *options);

trunk/dvoTools/src/dvoApplyCorrArguments.c

@@ -6 +6 @@
 
 static void usage (void) {
-    fprintf(stderr, "USAGE: dvoApplyCorr MOSAIC.fits OUTPUT\n\n");
+    fprintf(stderr, "USAGE: dvoApplyCorr -file INPUT.fits OUTPUT\n\n");
     exit (2);
 }
@@ -50 +50 @@
     }
 
-    if (argc != 2) usage ();
-
     // the input file is a required argument; if not found, we will exit
     bool status = pmConfigFileSetsMD (config->arguments, config, "INPUT", "-file", "-list");
@@ -58 +56 @@
     }
 
+    pmConfigFileSetsMD (config->arguments, config, "CORR", "-corr", "-corrlist");
+
+    if (argc != 2) usage ();
+
     // Add the output image (which remain on the command-line) to the arguments list
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Name of the output image", argv[1]);

trunk/dvoTools/src/dvoApplyCorrLoop.c

@@ -14 +14 @@
     // psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, RECIPE_NAME);
 
-    pmFPAfile *input = psMetadataLookupPtr(&status, config->files, "DVOCORR.INPUT");
+    pmFPAfile *input = psMetadataLookupPtr(&status, config->files, "DVOFLAT.INPUT");
     if (!status) {
         psErrorStackPrint(stderr, "Can't find input data!\n");
@@ -58 +58 @@
             if (!readout->data_exists) continue;
 
-            // XXX put the function here which unbins the input image
+            // XXX put the function here which multiplies the input image and the correction image
+            dvoApplyCorrReadout (config, view, "DVOFLAT.INPUT", "DVOFLAT.CORR");
 
             if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {

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);