Changeset 16196 for trunk/ippScripts/scripts/detrend_norm_exp.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_exp.pl (modified) (6 diffs)

trunk/ippScripts/scripts/detrend_norm_exp.pl

@@ -35 +35 @@
 use Pod::Usage qw( pod2usage );
 
-my ($det_id, $iter, $det_type, $camera, $dbname, $workdir, $reduction, $no_update, $no_op);
+my ($det_id, $iter, $det_type, $camera, $outroot, $dbname, $reduction, $no_update, $no_op);
 GetOptions(
            'det_id|d=s'        => \$det_id,
@@ -41 +41 @@
            'camera|c=s'        => \$camera,
            'det_type|t=s'      => \$det_type,
+           'outroot|w=s'       => \$outroot,   # output file base name
            'dbname|d=s'        => \$dbname, # Database name
-           'workdir|w=s'       => \$workdir,    # Working directory, for output files
            'reduction|=s'      => \$reduction,
            'no-update'         => \$no_update,
@@ -49 +49 @@
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --det_id --iteration --camera --det_type",
-           -exitval => 3)
-    unless defined $det_id
-    and defined $iter
-    and defined $camera
-    and defined $det_type;
+pod2usage( -msg => "Required options: --det_id --iteration --camera --det_type --outroot",
+           -exitval => 3) unless 
+    defined $det_id   and 
+    defined $iter     and 
+    defined $camera   and 
+    defined $det_type and
+    defined $outroot;
 
 $ipprc->define_camera($camera);
@@ -126 +127 @@
 close $list2File;
 
-# Output products
-$workdir = caturi( $workdir, "$camera.$det_type.$det_id" ) if defined $workdir;
-my $outputRoot = $ipprc->file_prepare( "$camera.$det_type.norm.$det_id.$iter", $workdir );
-my $jpeg1Name = $ipprc->filename("PPIMAGE.JPEG1", $outputRoot); # Binned JPEG #1
-my $jpeg2Name = $ipprc->filename("PPIMAGE.JPEG2", $outputRoot); # Binned JPEG #2
+# 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 $jpeg1Name = $ipprc->filename("PPIMAGE.JPEG1", $outroot); # Binned JPEG #1
+my $jpeg2Name = $ipprc->filename("PPIMAGE.JPEG2", $outroot); # Binned JPEG #2
 
 unless ($no_op) {
     # Make the jpeg for binning 1
-    $command = "$ppImage -list $list1Name $outputRoot -recipe PPIMAGE $recipe1"; # Command to run
+    $command = "$ppImage -list $list1Name $outroot -recipe PPIMAGE $recipe1"; # Command to run
     ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);
@@ -140 +146 @@
     
     # Make the jpeg for binning 2
-    $command = "$ppImage -list $list2Name $outputRoot -recipe PPIMAGE $recipe2"; # Command to run
+    $command = "$ppImage -list $list2Name $outroot -recipe PPIMAGE $recipe2"; # Command to run
     ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);
@@ -152 +158 @@
 $command .= " -iteration $iter";
 $command .= " -recip $recipe1,$recipe2";
-$command .= " -path_base $outputRoot ";
+$command .= " -path_base $outroot ";
 $command .= " -dbname $dbname" if defined $dbname;
 $command .= $stats->cmdflags();