Changeset 9233

Timestamp:

Oct 4, 2006, 12:40:28 PM (20 years ago)

Author:

Paul Price

Message:

Adding path support.

File:

• trunk/ippScripts/scripts/detrend_norm_exp.pl (modified) (5 diffs)

trunk/ippScripts/scripts/detrend_norm_exp.pl

@@ -11 +11 @@
 use PS::IPP::Metadata::List qw( parse_md_list );
 use Statistics::Descriptive;
+
+use PS::IPP::Config;
+my $ipprc = PS::IPP::Config->new(); # IPP configuration
+use File::Spec;
 
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
@@ -88 +92 @@
 }
 
+my $example = ${$files}[0];     # Example file, for path
+my ($vol, $dir, $file) = File::Spec->splitpath( $example );
+
 # Generate the file list, and get the statistics
 my $outputRoot = $camera . '.' . $det_type . '.norm.' . $det_id . '.' . $iter; # Root output name
+$outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
 my $list1Name = $outputRoot . '.b1.list'; # Name for the input file list for binning 1
 my $list2Name = $outputRoot . '.b2.list'; # Name for the input file list for binning 2
@@ -97 +105 @@
 open my $list2File, '>' . $list2Name;
 foreach my $file (@$files) {
-    print $list1File $file->{b1_uri} . "\n";
-    print $list2File $file->{b2_uri} . "\n";
+    print $list1File File::Spec-->rel2abs( $file->{b1_uri}, $ipprc->workdir() ) . "\n";
+    print $list2File File::Spec-->rel2abs( $file->{b2_uri}, $ipprc->workdir() ) . "\n";
     push @means, $file->{bg};
     push @stdevs, $file->{bg_stdev};
@@ -126 +134 @@
 
 # Add the result into the database
+$jpeg1Name = File::Spec->abs2rel( $jpeg1Name, $ipprc->workdir() );
+$jpeg2Name = File::Spec->abs2rel( $jpeg2Name, $ipprc->workdir() );
 unless ($no_update) {
     my $command = "$dettool -addnormexp -det_id $det_id -iteration $iter " .
@@ -133 +143 @@
         run(command => $command, verbose => 1);
     die "Unable to perform dettool -addnormexp: $error_code\n" if not $success;
+
+    unlink $list1File;
+    unlink $list2File;
 }