Changeset 16196 for trunk/ippScripts/scripts/detrend_norm_apply.pl

Timestamp:

Jan 22, 2008, 5:36:36 PM (18 years ago)

Author:

eugene

Message:

updates from eam_branch_20080121: workdir changed to outroot

File:

• trunk/ippScripts/scripts/detrend_norm_apply.pl (modified) (6 diffs)

trunk/ippScripts/scripts/detrend_norm_apply.pl

@@ -33 +33 @@
 
 # Parse the command-line
-my ($det_id, $iter, $class_id, $value, $input_uri, $camera, $det_type, $dbname, $workdir, $no_update, $no_op);
+my ($det_id, $iter, $class_id, $value, $input_uri, $camera, $det_type, $outroot, $dbname, $no_update, $no_op);
 GetOptions(
     'det_id|d=s'        => \$det_id,     # Detrend ID                           
@@ -42 +42 @@
     'camera|c=s'        => \$camera,     # Camera                               
     'det_type|t=s'      => \$det_type,   # Detrend type                         
+    'outroot|w=s'       => \$outroot,    # output file base name
     'dbname|d=s'        => \$dbname,     # Database name                                
-    'workdir|w=s'       => \$workdir,    # Working directory, for output files  
     'no-update'         => \$no_update,  # Don't update the database            
     'no-op'             => \$no_op,      # Don't do any operations               
@@ -49 +49 @@
     
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --det_id --iteration --class_id --value --input_uri --camera --det_type",
-           -exitval => 3) 
-    unless defined $det_id
-    and defined $iter
-    and defined $class_id
-    and defined $value
-    and defined $input_uri
-    and defined $camera
-    and defined $det_type;
+pod2usage( -msg => "Required options: --det_id --iteration --class_id --value --input_uri --camera --det_type --outroot",
+           -exitval => 3) unless 
+    defined $det_id    and 
+    defined $iter      and 
+    defined $class_id  and 
+    defined $value     and 
+    defined $input_uri and 
+    defined $camera    and 
+    defined $det_type  and
+    defined $outroot;
 
 $ipprc->define_camera($camera);
@@ -90 +91 @@
 &my_die("Couldn't find input file: $input_uri\n", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input_uri);
 
-$workdir = caturi( $workdir, "$camera.$det_type.$det_id" ) if defined $workdir;
-
-my $outputRoot = $ipprc->file_prepare( "$camera.$det_type.norm.$det_id.$iter", $workdir, $input_uri );
-
-my $output    = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $class_id);
-my $b1name    = $ipprc->filename("PPIMAGE.BIN1",   $outputRoot, $class_id);
-my $b2name    = $ipprc->filename("PPIMAGE.BIN2",   $outputRoot, $class_id);
-my $statsName = $ipprc->filename("PPIMAGE.STATS",  $outputRoot, $class_id);
-
-my $traceDest = 'file:' . $ipprc->file_resolve($outputRoot) . ".$class_id.trace"; # Trace messages
-my $logDest = 'file:' . $ipprc->file_resolve($outputRoot) . ".$class_id.log"; # Log messages
+# outroot examples (HOST components must be set)
+# file://data/ipp004.0/gpc1/20080130
+# neb:///ipp004-v1/gpc1/20080130
+# neb:///*/gpc1/20080130 (volume not specified)
+
+# check for existing directory, generate if needed
+$ipprc->outroot_prepare($outroot);
+
+my $output    = $ipprc->filename("PPIMAGE.OUTPUT", $outroot, $class_id) or &my_die("Missing entry from camera config", $det_id, $iter, $class_id, $PS_EXIT_CONFIG_ERROR);
+my $b1name    = $ipprc->filename("PPIMAGE.BIN1",   $outroot, $class_id) or &my_die("Missing entry from camera config", $det_id, $iter, $class_id, $PS_EXIT_CONFIG_ERROR);
+my $b2name    = $ipprc->filename("PPIMAGE.BIN2",   $outroot, $class_id) or &my_die("Missing entry from camera config", $det_id, $iter, $class_id, $PS_EXIT_CONFIG_ERROR);
+my $statsName = $ipprc->filename("PPIMAGE.STATS",  $outroot, $class_id) or &my_die("Missing entry from camera config", $det_id, $iter, $class_id, $PS_EXIT_CONFIG_ERROR);
+my $traceDest = $ipprc->filename("TRACE.IMFILE",   $outroot, $class_id) or &my_die("Missing entry from camera config", $det_id, $iter, $class_id, $PS_EXIT_CONFIG_ERROR);
+my $logDest   = $ipprc->filename("LOG.IMFILE",     $outroot, $class_id) or &my_die("Missing entry from camera config", $det_id, $iter, $class_id, $PS_EXIT_CONFIG_ERROR);
 
 # Run normalisation
 unless ($no_op) {
-    my $command = "$ppImage -file $input_uri $outputRoot";
+    my $command = "$ppImage -file $input_uri $outroot";
     $command .= " -norm $value -stats $statsName";
     $command .= " -recipe PPIMAGE $RECIPE_PPIMAGE";
@@ -118 +122 @@
         &my_die("Unable to perform ppImage: $error_code", $det_id, $iter, $class_id, $error_code);
     }
-    &my_die("Can't find expected output file: $output", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($output);
-    &my_die("Can't find expected output file: $b1name", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($b1name);
-    &my_die("Can't find expected output file: $b2name", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($b2name);
+    &my_die("Can't find expected output file: $output",    $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($output);
+    &my_die("Can't find expected output file: $b1name",    $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($b1name);
+    &my_die("Can't find expected output file: $b2name",    $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($b2name);
     &my_die("Can't find expected output file: $statsName", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($statsName);
     
@@ -149 +153 @@
 $command .= " -class_id $class_id";
 $command .= " -uri $output";
-$command .= " -path_base $outputRoot";
+$command .= " -path_base $outroot";
 $command .= " -dbname $dbname" if defined $dbname;
 $command .= $stats->cmdflags();