Changeset 10419 for trunk/ippScripts/scripts/detrend_norm_exp.pl

Timestamp:

Dec 3, 2006, 8:42:44 AM (19 years ago)

Author:

eugene

Message:

added ipprc.convert_filename method, replaced workdir conversions with convert_filename

File:

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

trunk/ippScripts/scripts/detrend_norm_exp.pl

@@ -95 +95 @@
 # 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() );
+$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
+$outputRoot = $ipprc->convert_filename ($outputRoot);
 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
@@ -103 +104 @@
 open my $list2File, '>' . $list2Name;
 foreach my $file (@$files) {
-    print $list1File (File::Spec->rel2abs( $file->{b1_uri}, $ipprc->workdir() ) . "\n");
-    print $list2File (File::Spec->rel2abs( $file->{b2_uri}, $ipprc->workdir() ) . "\n");
+    print $list1File ($ipprc->convert_filename ( $file->{b1_uri} ) . "\n");
+    print $list2File ($ipprc->convert_filename ( $file->{b2_uri} ) . "\n");
     push @means, $file->{bg};
     push @stdevs, $file->{bg_stdev};
@@ -132 +133 @@
 
 # Add the result into the database
-$jpeg1Name = File::Spec->abs2rel( $jpeg1Name, $ipprc->workdir() );
-$jpeg2Name = File::Spec->abs2rel( $jpeg2Name, $ipprc->workdir() );
+$jpeg1Name = $ipprc->convert_filename ( $jpeg1Name );
+$jpeg2Name = $ipprc->convert_filename ( $jpeg2Name );
 unless ($no_update) {
     my $command = "$dettool -addnormalizedexp -det_id $det_id -iteration $iter " .