Changeset 5976 for trunk/ppImage/src/ppImageConfig.c

Timestamp:

Jan 13, 2006, 5:14:07 PM (20 years ago)

Author:

Paul Price

Message:

Small hacks from updating psModule code for FPAs and concepts

File:

• trunk/ppImage/src/ppImageConfig.c (modified) (3 diffs)

trunk/ppImage/src/ppImageConfig.c

@@ -1 @@
-# include "ppImage.h"
+#include "ppImage.h"
 
-bool ppImageConfig (ppConfig *config, int argc, char **argv) {
+bool ppImageConfig(ppConfig *config, int argc, char **argv)
+{
+    // Initialise the configuration
+    config->site = NULL;                // Site configuration
+    config->camera = NULL;              // Camera configuration
+    config->recipe = NULL;              // Recipe configuration
+    config->arguments = NULL;           // The command-line arguments
+    config->database = NULL;            // Database handle
 
-    // Parse the configurations
-    config->site = NULL;            // Site configuration
-    config->camera = NULL;          // Camera configuration
-    config->recipe = NULL;          // Recipe configuration
-
-    // XXX - this should be split into a function to parse argc,argv 
-    //       and a second to read the config files.  
+    // XXX - this should be split into a function to parse argc,argv
+    //       and a second to read the config files.
     //       all argc,argv should be interpretted before work is done.
     if (! pmConfigRead(&config->site, &config->camera, &config->recipe, &argc, argv, RECIPE)) {
@@ -23 +25 @@
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-flat", 0, "Name of the flat-field image", "");
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-mask", 0, "Name of the mask image", "");
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-fringe", 0, "Name of the fringe image", "");
     psMetadataAddS32(config->arguments, PS_LIST_TAIL, "-chip", 0, "Chip number to process (if positive)", -1);
 
@@ -33 +36 @@
     }
 
-    // add the input and output images to the arguments list
-    psMetadataAddStr (config->arguments, PS_LIST_TAIL, "-input",  0, "Name of the input image",  argv[1]);
-    psMetadataAddStr (config->arguments, PS_LIST_TAIL, "-output", 0, "Name of the output image", argv[2]);
+    // Add the input and output images (which remain on the command-line) to the arguments list
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-input",  0, "Name of the input image",  argv[1]);
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-output", 0, "Name of the output image", argv[2]);
 
-    // define Database handle, if used
+    // Define database handle, if used
+#if 0
     config->database = pmConfigDB(config->site);
+#endif
+
     return true;
-} 
+}