Changeset 33415 for branches/meh_branches/ppstack_test/psvideophot/src/psvideophotArguments.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

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

branches/meh_branches/ppstack_test/psvideophot/src

@@ -1 +1 @@
 psvideophot
+dumpvideo
 Makefile
 Makefile.in
@@ -9 +10 @@
 psvideophotVersionDefinitions.h
 
+

@@ -1 +1 @@
 psvideophot
+dumpvideo
 Makefile
 Makefile.in
@@ -9 +10 @@
 psvideophotVersionDefinitions.h
 
+

branches/meh_branches/ppstack_test/psvideophot/src/psvideophotArguments.c

@@ -6 +6 @@
 
 static void usage (void) {
-    fprintf(stderr, "USAGE: psvideophot [-file INPUT.fits] [-list INPUT.txt] OUTPUT\n\n");
+    fprintf(stderr, "USAGE: psvideophot [-file INPUT.fits] [-list INPUT.txt] OUTPUT -class_id CLASS_ID -cell_id CELL_ID\n\n");
     fprintf(stderr, "Optional arguments:\n");
     fprintf(stderr, "\t-stats STATS.mdc: Output statistics into STATS.mdc\n");
-    fprintf(stderr, "\t-isfringe: The input image contains fringe data.\n");
-    fprintf(stderr, "\t-isdark: The input image contains dark data.\n");
-    fprintf(stderr, "\t-usemask MASKVAL: Use this mask value (override recipe).\n");
-    fprintf(stderr, "\t-chip CHIPNUM: Only process this chip number.\n");
-    fprintf(stderr, "\t-norm VALUE: Divide through by this value when done.\n");
-    fprintf(stderr, "\t-normlist file.mdc: normalizations by class_id.\n");
-    fprintf(stderr, "\t-video: process video cells\n");
+    fprintf(stderr, "\t-video_extname VIDEOEXTNAME: EXTNAME for video table\n");
     fprintf(stderr, "\n");
     fprintf(stderr, "Input options (single file / file list):\n");
-    fprintf(stderr, "\t-noisemap/-noisemaplist: Noise Map image.\n");
-    fprintf(stderr, "\t-bias/-biaslist: Bias image.\n");
-    fprintf(stderr, "\t-dark/-darklist: Dark image.\n");
-    fprintf(stderr, "\t-shutter/-shutterlist: Shutter image.\n");
-    fprintf(stderr, "\t-flat/-flatlist: Flat image.\n");
-    fprintf(stderr, "\t-mask/-masklist: Mask image.\n");
-    fprintf(stderr, "\t-fringe/-fringelist: Fringe image and data.\n");
-    fprintf(stderr, "\t-linearity/-linearlist: linearity correction file.\n");
     fprintf(stderr, "\n");
     exit (2);
@@ -63 +49 @@
     // psMetadata *options = psMetadataAlloc ();
     // psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "PSVIDEOPHOT.OPTIONS",  PS_DATA_METADATA, "", options);
+
+    if ((argnum = psArgumentGet(argc, argv, "-class_id"))) {
+        psArgumentRemove(argnum, &argc, argv);
+        psMetadataAddStr(config->arguments, PS_LIST_TAIL, "CLASS_ID", PS_META_REPLACE,
+                         "Chip to process", argv[argnum]);
+        psArgumentRemove(argnum, &argc, argv);
+    } else {
+        fprintf(stderr, "-class_id is required\n");
+        usage();
+    }
+    if ((argnum = psArgumentGet(argc, argv, "-cell_id"))) {
+        psArgumentRemove(argnum, &argc, argv);
+        psMetadataAddStr(config->arguments, PS_LIST_TAIL, "CELL_ID", PS_META_REPLACE,
+                         "Cell to process", argv[argnum]);
+        psArgumentRemove(argnum, &argc, argv);
+    } else {
+        fprintf(stderr, "-cell_id is required\n");
+        usage();
+    }
+    if ((argnum = psArgumentGet(argc, argv, "-video_extname"))) {
+        psArgumentRemove(argnum, &argc, argv);
+        psMetadataAddStr(config->arguments, PS_LIST_TAIL, "VIDEOEXTNAME", PS_META_REPLACE,
+                         "EXTNAME of video table", argv[argnum]);
+        psArgumentRemove(argnum, &argc, argv);
+    }
 
     if ((argnum = psArgumentGet(argc, argv, "-stats"))) {
@@ -117 +128 @@
     // the input file is a required argument; if not found, we will exit
     pmConfigFileSetsMD (config->arguments, &argc, argv, "INPUT", "-file", "-list");
+    pmConfigFileSetsMD (config->arguments, &argc, argv, "ASTROM", "-astrom", "-astromlist");
 
     // if these command-line options are supplied, load the file name lists into config->arguments
@@ -168 +180 @@
 
     // Add the input and output images (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]);
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Name of the output table", argv[1]);
 
     return config;

@@ -1 +1 @@
 psvideophot
+dumpvideo
 Makefile
 Makefile.in
@@ -9 +10 @@
 psvideophotVersionDefinitions.h
 
+