Changeset 23966 for trunk/ippScripts/scripts/magic_process.pl

Timestamp:

Apr 24, 2009, 2:20:13 PM (17 years ago)

Author:

bills

Message:

pass the template image to DetectStreaks

File:

• trunk/ippScripts/scripts/magic_process.pl (modified) (4 diffs)

trunk/ippScripts/scripts/magic_process.pl

@@ -37 +37 @@
 
 # Parse the command-line arguments
-my ($magic_id, $node, $camera, $dbname, $outroot, $save_temps, $verbose, $no_update, $no_op, $logfile);
+my ($magic_id, $node, $camera, $dbname, $outroot, $template_uri, $save_temps, $verbose, $no_update, $no_op, $logfile);
 
 GetOptions(
@@ -45 +45 @@
            'dbname=s'        => \$dbname,     # Database name
            'outroot=s'       => \$outroot,    # Output root name
+           'template_uri=s'  => \$template_uri,# uri of diff template
            'save-temps'      => \$save_temps, # Save temporary files?
            'verbose'         => \$verbose,    # Print stuff?
@@ -58 +59 @@
     defined $node and
     defined $camera and
-    defined $outroot;
+    defined $outroot and
+    defined $template_uri;
 
 my $ipprc = PS::IPP::Config->new( $camera ) or my_die( "Unable to set up", $magic_id, $node, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
@@ -136 +138 @@
         }
 
-        $command .= " --detect --image $image --mask $mask --weight $weight";
+        my $template = $ipprc->file_resolve($template_uri);
+        &my_die("failed to resolve template_uri: $template_uri", $magic_id, $node, $PS_EXIT_DATA_ERROR)
+            if !($template);
+
+        $command .= " --detect --image $image --mask $mask --weight $weight -k $template";
 
         # set threshold to 4 sigma