Changeset 24951 for branches/czw_branch/cleanup/ppMerge/src/ppMergeArguments.c

Timestamp:

Jul 30, 2009, 5:20:29 PM (17 years ago)

Author:

watersc1

Message:

Finished up my edits to the detrend cleanup, and some changes to my
copy of burntool and the pslib astrometry. Detrend cleanup has not
been tested yet. That's up next.

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• ppMerge/src/ppMergeArguments.c (modified) (7 diffs)

branches/czw_branch/cleanup/ppMerge/src/ppMergeArguments.c

@@ -170 +170 @@
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-fringe-xsmooth", 0, "Number of smoothing regions in x", 0);
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-fringe-ysmooth", 0, "Number of smoothing regions in y", 0);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-fringe-smooth", 0, "Smooth output image", false);
+    psMetadataAddF32(arguments, PS_LIST_TAIL, "-fringe-smooth-sigma", 0, "Size of smoothing Gaussian", NAN);
 
     /** CTEMASK construction parameters */
@@ -203 +205 @@
     }
 
+    if ((argnum = psArgumentGet (argc, argv, "-visual"))) {
+        psArgumentRemove (argnum, &argc, argv);
+        pmVisualSetVisual(true);
+    }
+
     // Number of threads
     if ((argnum = psArgumentGet(argc, argv, "-threads"))) {
@@ -248 +255 @@
     }
     if (strcasecmp(typeStr, "DARK") == 0 ||
+        strcasecmp(typeStr, "DARKTEST") == 0 ||
         strcasecmp(typeStr, "DARK_PREMASK") == 0) {
       type = PPMERGE_TYPE_DARK;
@@ -323 +331 @@
     VALUE_ARG_RECIPE_INT("-fringe-xsmooth", "FRINGE.XSMOOTH", S32, 0);
     VALUE_ARG_RECIPE_INT("-fringe-ysmooth", "FRINGE.YSMOOTH", S32, 0);
+    VALUE_ARG_RECIPE_BOOL("-fringe-smooth", "FRINGE.SMOOTH");
+    VALUE_ARG_RECIPE_FLOAT("-fringe-smooth-sigma", "FRINGE.SMOOTH.SIGMA", F32);
 
     /** CTEMASK construction parameters */
@@ -370 +380 @@
             bool scale = false;         ///< Scale values?
             float min = NAN, max = NAN; ///< Minimum and maximum values for scaling
+            char *rule = NULL;
             switch (item->type) {
               case PS_TYPE_S32:
@@ -380 +391 @@
                 min = psMetadataLookupF32(&mdok, item->data.md, "MIN");
                 max = psMetadataLookupF32(&mdok, item->data.md, "MAX");
+                rule = psMetadataLookupStr(&mdok, item->data.md, "RULE");
                 break;
               default:
@@ -397 +409 @@
             ord->min = min;
             ord->max = max;
+            ord->rule = psStringCopy(rule);
             psArrayAdd(translated, translated->n, ord);
             psFree(ord);