Changeset 26008

Timestamp:

Nov 2, 2009, 6:07:02 PM (17 years ago)

Author:

watersc1

Message:

Inserted the dumpconfig code that was commented out.

Made edit so that -sigma command line argument is respected.

Location:

trunk/ppSmooth/src

Files:

• ppSmoothArguments.c (modified) (3 diffs)
• ppSmoothLoop.c (modified) (1 diff)
• ppSmoothReadout.c (modified) (1 diff)

trunk/ppSmooth/src/ppSmoothArguments.c

@@ -66 +66 @@
         psArgumentRemove (argnum, &argc, argv);
     }
+    //    XXX ADD this in?
+    if ((argnum = psArgumentGet(argc, argv, "-dumpconfig"))) {
+        psArgumentRemove(argnum, &argc, argv);
+        psMetadataAddStr(config->arguments, PS_LIST_TAIL, "DUMP_CONFIG", PS_META_REPLACE,
+                         "Filename for configuration dump", argv[argnum]);
+        psArgumentRemove(argnum, &argc, argv);
+    }
 
     if (argc != 2) usage ();
@@ -71 +78 @@
     // 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]);
+
+
 
     return config;
@@ -89 +98 @@
     // }
 
-    // XXX ADD this in?
-    // if ((argnum = psArgumentGet(argc, argv, "-dumpconfig"))) {
-    //     psArgumentRemove(argnum, &argc, argv);
-    //     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "DUMP_CONFIG", PS_META_REPLACE,
-    //                      "Filename for configuration dump", argv[argnum]);
-    //     psArgumentRemove(argnum, &argc, argv);
-    // }
 

trunk/ppSmooth/src/ppSmoothLoop.c

@@ -88 +88 @@
     psFree(view);
 
+    psString dump_file = psMetadataLookupStr(&status, config->arguments, "DUMP_CONFIG");
+    if (dump_file) {
+      if (!pmConfigDump(config, dump_file)) {
+        ESCAPE("Unable to dump configuration.");
+      }
+    }
+
+
     return true;
 }

trunk/ppSmooth/src/ppSmoothReadout.c

@@ -35 +35 @@
     float minGauss = 0.1;
     float nSigma = 3.0;
-    float sigma = psMetadataLookupF32 (&status, recipe, "SIGMA");
+    float sigma;
+    if (!(sigma = psMetadataLookupF32(&status,config->arguments,"SIGMA"))) {
+      sigma = psMetadataLookupF32 (&status, recipe, "SIGMA");
+    }
 
     bool oldThreads = psImageConvolveSetThreads(true); // Old value of threading in psImageConvolve