Changeset 24557 for branches/eam_branches/20090522/ippScripts/scripts/magic_process.pl

Timestamp:

Jun 25, 2009, 2:00:56 PM (17 years ago)

Author:

eugene

Message:

merging changes from head

Location:

branches/eam_branches/20090522

Files:

• . (modified) (1 prop)
• ippScripts/scripts/magic_process.pl (modified) (2 diffs)

branches/eam_branches/20090522/ippScripts/scripts/magic_process.pl

@@ -142 +142 @@
         $command .= " --detect --image $image --mask $mask --weight $weight -k $template";
 
-        # set threshold to 4 sigma
-        $command .= ' -t 4';
-
-        # add -S
+        # XXX: get all of these parameters from a recipe
+
+        # set threshold to 4 sigma 
+        $command .= ' -t 2.3';
+#        $command .= ' -t 4';
+
+        # set Minimum percent visible required between pixels clusters in a valid streak [0.0 - 1.0]
+        # default is 0.2
+        $command .= ' -P 0.2';
+
+        #$command .= ' -t 4' . ' -P 0.25';
+
+        # add -S "Number of pixels to shift for determining maximum differences in mean images default:8"
         $command .= ' -S';
+
+        # add 3 x 3 binning
+        $command .= ' -b 3';
 
         # create the list of inputs used at this stage. At higher levels the
@@ -349 +361 @@
     my $node = shift;
 
-    my $image;                  # Name of template to return
-    my $path_base;              # Base name for name
-    if (defined $node->{warp_path_base} and $node->{warp_path_base} ne "NULL") {
-        $path_base = $node->{warp_path_base};
-        $image = "PSWARP.OUTPUT";
-    } elsif (defined $node->{stack_path_base} and $node->{stack_path_base} ne "NULL") {
-        $path_base = $node->{stack_path_base};
-        $image = "PPSTACK.OUTPUT";
-    } else {
-        return undef;
-    }
+    my $path_base = $node->{diff_path_base}; # Base name for name
+    my $image = $node->{inverse} ? "PPSUB.INPUT.CONV" : "PPSUB.REF.CONV"; # File rule of interest
 
     $image = $ipprc->file_resolve($ipprc->filename($image, $path_base));