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

Timestamp:

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

Author:

eugene

Message:

added ipprc.convert_filename method, replaced workdir conversions with convert_filename

File:

• trunk/ippScripts/scripts/detrend_resid.pl (modified) (2 diffs)

trunk/ippScripts/scripts/detrend_resid.pl

@@ -85 +85 @@
 my ($vol, $dir, $file) = File::Spec->splitpath( $input_uri );
 my $outputRoot = $exp_tag . '.detresid.' . $det_id . '.' . $iter; # Root name
-$outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
-$input_uri = File::Spec->rel2abs( $input_uri, $ipprc->workdir() );
-$detrend = File::Spec->rel2abs( $detrend, $ipprc->workdir() );
+$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
+$outputRoot = $ipprc->convert_filename ( $outputRoot );
+$input_uri = $ipprc->convert_filename ( $input_uri );
+$detrend = $ipprc->convert_filename ( $detrend );
 
 my $outputName = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $class_id);
@@ -123 +124 @@
 
 # Add the processed file to the database
-$outputName = File::Spec->abs2rel ($outputName, $ipprc->workdir() );
-$bin1Name = File::Spec->abs2rel( $bin1Name, $ipprc->workdir() );
-$bin2Name = File::Spec->abs2rel( $bin2Name, $ipprc->workdir() );
+$outputName = $ipprc->convert_filename ( $outputName );
+$bin1Name = $ipprc->convert_filename ( $bin1Name );
+$bin2Name = $ipprc->convert_filename ( $bin2Name );
 unless ($no_update) {
     my $command = "$dettool -addresidimfile -det_id $det_id -iteration $iter -exp_tag $exp_tag " .