Changeset 35527 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpArguments.c

Timestamp:

May 7, 2013, 12:01:01 PM (13 years ago)

Author:

eugene

Message:

pswarp can now take an input.mdc file with multiple input images listed to generate a warp for a collection

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpArguments.c (modified) (1 diff)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpArguments.c

@@ -83 +83 @@
     pswarpSetThreads();
 
-    pmConfigFileSetsMD (config->arguments, &argc, argv, "INPUT", "-file", "-list");
-    pmConfigFileSetsMD (config->arguments, &argc, argv, "MASK", "-mask", "-masklist");
-    pmConfigFileSetsMD (config->arguments, &argc, argv, "VARIANCE", "-variance", "-variancelist");
-    pmConfigFileSetsMD (config->arguments, &argc, argv, "BACKGROUND", "-background", "-bkglist");
+    // there are three mutually exclusive ways of providing the input
+    // 1) supply -file (filename) [-mask .. -variance ..] on the command line
+    // 2) supply -input (input.mdc) on the command line
+    // 3) load inputs from RUN config info
+
+    // below, we check first for -file then for -input.  failure to find either implies use of
+    // the configuration metadata file.
+
+    bool singleInput = pmConfigFileSetsMD (config->arguments, &argc, argv, "INPUT", "-file", "-list");
+    if (singleInput) {
+        if (psArgumentGet(argc, argv, "-input")) {
+            psErrorStackPrint(stderr, "error in arguments : -input and -file / -list are mutually exclusive");
+            exit(PS_EXIT_CONFIG_ERROR);
+        }       
+        pmConfigFileSetsMD (config->arguments, &argc, argv, "MASK", "-mask", "-masklist");
+        pmConfigFileSetsMD (config->arguments, &argc, argv, "VARIANCE", "-variance", "-variancelist");
+        pmConfigFileSetsMD (config->arguments, &argc, argv, "BACKGROUND", "-background", "-bkglist");
+    } else {
+        // find the input data file (an mdc file)
+        if ((N = psArgumentGet(argc, argv, "-input"))) {
+            if (argc <= N+1) {
+                psErrorStackPrint(stderr, "Expected to see 1 more argument; saw %d", argc - 1);
+                exit(PS_EXIT_CONFIG_ERROR);
+            }
+            psArgumentRemove(N, &argc, argv);
+
+            unsigned int numBad = 0;                     // Number of bad lines
+            psMetadata *inputs = psMetadataConfigRead(NULL, &numBad, argv[N], false); // Input file info
+            if (!inputs || numBad > 0) {
+                psErrorStackPrint(stderr, "Unable to cleanly read MDC file with inputs.");
+                exit(PS_EXIT_CONFIG_ERROR);
+            }
+            psMetadataAddMetadata(config->arguments, PS_LIST_TAIL, "INPUTS", 0, "Metadata with input details", inputs);
+            psFree(inputs);
+
+            psArgumentRemove(N, &argc, argv);
+        }
+    }
+    if (argc != 3) {
+        usage();
+    }
+    if (psErrorCodeLast() != PS_ERR_NONE) {
+        psErrorStackPrint(stderr, "error in arguments");
+        exit(PS_EXIT_CONFIG_ERROR);
+    }
     
-    if (argc != 3) {
-        usage();
-    }
-
-
     psArray *array;