Changeset 27657 for trunk/psphot/src/psphotStackArguments.c

Timestamp:

Apr 11, 2010, 5:08:29 PM (16 years ago)

Author:

eugene

Message:

updates to support psphotStack

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotStackArguments.c (modified) (4 diffs)

trunk/psphot/src

@@ -21 +21 @@
 psphotForced
 psphotMakePSF
+psphotStack

@@ -21 +21 @@
 psphotForced
 psphotMakePSF
+psphotStack

trunk/psphot/src/psphotStackArguments.c

@@ -2 +2 @@
 
 static void usage(pmConfig *config, int exitCode);
-static void writeHelpInfo(pmConfig* config, FILE* ofile);
+static void writeHelpInfo(FILE* ofile);
 
 pmConfig *psphotStackArguments(int argc, char **argv) {
 
     int N;
-    bool status;
 
     // print help info
-    if (psArgumentGet(argc, argv, "-help")) writeHelpInfo(argv[0], config, stdout);
-    if (psArgumentGet(argc, argv, "-h")) writeHelpInfo(argv[0], config, stdout);
+    if (psArgumentGet(argc, argv, "-help")) writeHelpInfo(stdout);
+    if (psArgumentGet(argc, argv, "-h")) writeHelpInfo(stdout);
 
     // load config data from default locations
@@ -29 +28 @@
     // Number of threads is handled
     PSARGUMENTS_INSTANTIATE_THREADSARG( psphot, config, argc, argv )
-
-    // photcode : used in output to supplement header data (argument or recipe?)
-    if ((N = psArgumentGet (argc, argv, "-photcode"))) {
-        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);
-        psMetadataAddStr (options, PS_LIST_TAIL, "PHOTCODE", PS_META_REPLACE, "", argv[N]);
-        psArgumentRemove (N, &argc, argv);
-    }
 
     // visual : interactive display mode
@@ -90 +78 @@
 }
 
-static void writeHelpInfo(pmConfig* config, FILE* ofile)
+static void writeHelpInfo(FILE* ofile)
 {
   fprintf(ofile,
-          "Usage: psphotStack -input (input.mdc) outroot\n"
+          "Usage: psphotStack -input (INPUTS.mdc) (OUTROOT)\n"
           "\n"
-          "where:\n"
-          "  FileNameList is a text file containing filenames, one per line\n"
-          "  MaskFileNameList is a text file of mask filenames, one per line\n"
-          "  VarFileNameList is a text file of variance filenames, one per line\n"
-          "  OutFileBaseName is the 'root name' for output files\n"
+          "where INPUTS.mdc contains various METADATAs, each with:\n"
+          "\tIMAGE(STR):     Image filename\n"
+          "\tMASK(STR):      Mask filename\n"
+          "\tVARIANCE(STR):  Variance map filename\n"
+          "OUTROOT is the 'root name' for output files\n"
           "\n"
           "additional options:\n"
@@ -136 +124 @@
           "  -trace-levels\n"
           "     print current trace levels\n");
-    psFree(config);
-    pmConfigDone();
     psLibFinalize();
     exit(PS_EXIT_SUCCESS);

@@ -21 +21 @@
 psphotForced
 psphotMakePSF
+psphotStack