Changeset 21365 for trunk/ppMerge/src/ppMergeArguments.c

Timestamp:

Feb 5, 2009, 4:47:00 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

• trunk/ppMerge/src/ppMergeArguments.c (modified) (4 diffs)

trunk/ppMerge/src/ppMergeArguments.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-01 21:43:05 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-06 02:44:31 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
@@ -25 +25 @@
             "\tIMAGE(STR):     Image filename\n"
             "\tMASK(STR):      Mask filename\n"
-            "\tWEIGHT(STR)     Weight map filename\n"
-            "where MASK and WEIGHT are optional.",
+            "\tVARIANCE(STR)   Variance map filename\n"
+            "where MASK and VARIANCE are optional.",
             program);
     fprintf(stderr, "\n");
@@ -155 +155 @@
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-frachigh", 0, "Fraction of low pixels to discard", NAN);
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-nkeep",    0, "Minimum number of pixels in stack to keep", 0);
-    psMetadataAddBool(arguments, PS_LIST_TAIL, "-weights", 0, "Use image weights in combination?", false);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-variances", 0, "Use image variances in combination?", false);
 
     // XXX EAM : not clear this should be allowed on the command line.
@@ -300 +300 @@
     VALUE_ARG_RECIPE_FLOAT("-frachigh", "FRACHIGH", F32);
     VALUE_ARG_RECIPE_INT("-nkeep",      "NKEEP",    S32, 0);
-    VALUE_ARG_RECIPE_BOOL("-weights",   "WEIGHTS");
+    VALUE_ARG_RECIPE_BOOL("-variances", "VARIANCES");
 
     // XXX we do not supply this on the command line