Changeset 13515 for trunk/ppStack/src/ppStackArguments.c

Timestamp:

May 24, 2007, 2:28:58 PM (19 years ago)

Author:

Paul Price

Message:

Get arguments from a single MDC file instead of an annoying number of files with vectors and filenames.

File:

• trunk/ppStack/src/ppStackArguments.c (modified) (2 diffs)

trunk/ppStack/src/ppStackArguments.c

@@ -17 +17 @@
 {
     fprintf(stderr, "\nPan-STARRS Image combination\n\n");
-    fprintf(stderr, "Usage: %s IMAGES.list MASKS.list OUTPUT_ROOT\n",
+    fprintf(stderr, "Usage: %s INPUTS.mdc OUTPUT_ROOT\n"
+            "where INPUTS.mdc contains:\n"
+            "\tIMAGE(STR):  Image filename\n"
+            "\tMASK(STR):   Mask filename\n"
+            "\tSEEING(F32): Seeing FWHM (pixels)\n"
+            "\tWEIGHT(F32): Relative weighting to be applied\n"
+            "\tSCALE(F32):  Relative scaling to be applied\n",
             program);
     fprintf(stderr, "\n");
@@ -85 +91 @@
     psMetadataAddU8(arguments,  PS_LIST_TAIL, "-mask-bad", 0, "Mask value for bad pixels", 0);
     psMetadataAddU8(arguments,  PS_LIST_TAIL, "-mask-blank", 0, "Mask value for blank region", 0);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-seeing", 0, "Name of file with seeing FWHMs", NULL);
 
-    if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 4) {
+    if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 3) {
         usage(argv[0], arguments, config);
     }
 
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "IMAGES.LIST", 0,
-                     "Name of the input image list", argv[1]);
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "MASKS.LIST", 0,
-                     "Name of the input masks list", argv[2]);
+    int numBad = 0;                     // Number of bad lines
+    psMetadata *inputs = psMetadataConfigRead(NULL, &numBad, argv[1], false); // Information about inputs
+    if (!inputs || numBad > 0) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Unable to cleanly read MDC file with inputs.");
+        goto ERROR;
+    }
+    psMetadataAddMetadata(config->arguments, PS_LIST_TAIL, "INPUTS", 0,
+                          "Metadata with input details", inputs);
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0,
-                     "Root name of the output image list", argv[3]);
+                     "Root name of the output image list", argv[2]);
 
-    valueArgStr(config, arguments, "-stat",      "STATS",         config->arguments);
+    valueArgStr(config, arguments, "-stat", "STATS", config->arguments);
 
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // Recipe for ppSim