Changeset 21524 for trunk/ppSub/src/ppSubArguments.c

Timestamp:

Feb 17, 2009, 2:31:20 PM (17 years ago)

Author:

Paul Price

Message:

Cleaning up. Had trouble getting the output photometry file written out, but works now.

File:

• trunk/ppSub/src/ppSubArguments.c (modified) (3 diffs)

trunk/ppSub/src/ppSubArguments.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-09 21:26:05 $
+ *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <pslib.h>
+#include <psmodules.h>
+#include <psphot.h>
 
 #include "ppSub.h"
@@ -240 +249 @@
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-opt-order", 0, "Maximum order for optimum kernel search", -1);
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-dual", 0, "Dual convolution", false);
-    psMetadataAddBool(arguments, PS_LIST_TAIL, "-renorm", 0, "Renormalise variance maps?", false);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-renorm-mean", 0,
-                     "Statistic for mean in renormalisation", NULL);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-renorm-stdev", 0,
-                     "Statistic for stdev in renormalisation", NULL);
-    psMetadataAddF32(arguments, PS_LIST_TAIL, "-renorm-width", 0, "Gaussian width for renormalisation", NAN);
-    psMetadataAddS32(arguments, PS_LIST_TAIL, "-renorm-num", 0, "Number of samples for renormalisation", 0);
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-photometry", 0, "Perform photometry?", false);
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-threads", 0, "Number of threads", 0);
@@ -352 +354 @@
                       psMetadataLookupBool(NULL, arguments, "-dual"));
 
-    if (psMetadataLookupBool(NULL, arguments, "-renorm") ||
-        psMetadataLookupBool(NULL, recipe, "RENORM")) {
-        psMetadataAddBool(arguments, PS_LIST_TAIL, "RENORM", 0, "Renormalise variance maps?", true);
-    }
-    VALUE_ARG_RECIPE_INT("-renorm-num", "RENORM.NUM", S32, 0);
-    VALUE_ARG_RECIPE_FLOAT("-renorm-width", "RENORM.WIDTH", F32);
-    valueArgRecipeStr(arguments, recipe, "-renorm-mean", "RENORM.MEAN", recipe);
-    valueArgRecipeStr(arguments, recipe, "-renorm-stdev", "RENORM.STDEV", recipe);
-
     // Need to update this because it could have been overwritten by the camera's own recipe
     if (psMetadataLookupBool(NULL, arguments, "-photometry")) {