Index: trunk/ippScripts/scripts/detrend_norm_apply.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_norm_apply.pl	(revision 10398)
+++ trunk/ippScripts/scripts/detrend_norm_apply.pl	(revision 10419)
@@ -59,9 +59,10 @@
 
 my ($vol, $dir, $file) = File::Spec->splitpath( $input );
-$input = File::Spec->rel2abs( $input, $ipprc->workdir() );
+$input = $ipprc->convert_filename ( $input );
 
 # Output name
 my $outputRoot = $camera . '.' . $detType . '.norm.' . $detId . '.' . $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 $output = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $classId);
@@ -99,7 +100,7 @@
 
 # Update the database
-$output = File::Spec->abs2rel( $output, $ipprc->workdir() );
-$b1name = File::Spec->abs2rel( $b1name, $ipprc->workdir() );
-$b2name = File::Spec->abs2rel( $b2name, $ipprc->workdir() );
+$output = $ipprc->convert_filename ( $output );
+$b1name = $ipprc->convert_filename ( $b1name );
+$b2name = $ipprc->convert_filename ( $b2name );
 unless ($no_update) {
     my $command = "$dettool -addnormalizedimfile -det_id $detId -iteration $iter -class_id $classId ".
Index: trunk/ippScripts/scripts/detrend_norm_exp.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_norm_exp.pl	(revision 10398)
+++ trunk/ippScripts/scripts/detrend_norm_exp.pl	(revision 10419)
@@ -95,5 +95,6 @@
 # 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,6 +104,6 @@
 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,6 +133,6 @@
 
 # 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 " .
Index: trunk/ippScripts/scripts/detrend_process_exp.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_process_exp.pl	(revision 10398)
+++ trunk/ippScripts/scripts/detrend_process_exp.pl	(revision 10419)
@@ -93,5 +93,6 @@
 # Generate the file list, and get the statistics
 my $outputRoot = $exp_tag . '.detproc.' . $det_id; # 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
@@ -101,6 +102,6 @@
 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};
@@ -131,7 +132,7 @@
 
 # Add the result into the database
-$outputRoot = File::Spec->abs2rel( $outputRoot, $ipprc->workdir() );
-$jpeg1  = File::Spec->abs2rel( $jpeg1, $ipprc->workdir() );
-$jpeg2  = File::Spec->abs2rel( $jpeg2, $ipprc->workdir() );
+$outputRoot = $ipprc->convert_filename ( $outputRoot );
+$jpeg1  = $ipprc->convert_filename ( $jpeg1 );
+$jpeg2  = $ipprc->convert_filename ( $jpeg2 );
 unless ($no_update) {
     my $command = "$dettool -addprocessedexp -det_id $det_id -exp_tag $exp_tag " .
Index: trunk/ippScripts/scripts/detrend_process_imfile.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_process_imfile.pl	(revision 10398)
+++ trunk/ippScripts/scripts/detrend_process_imfile.pl	(revision 10419)
@@ -64,6 +64,7 @@
 my ($vol, $dir, $file) = File::Spec->splitpath( $input_uri );
 my $outputRoot = $exp_tag . '.detproc.' . $det_id; # Root name
-$outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
-$input_uri = File::Spec->rel2abs( $input_uri, $ipprc->workdir() );
+$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
+$outputRoot = $ipprc->convert_filename ($outputRoot);
+$input_uri = $ipprc->convert_filename ( $input_uri );
 
 my $outputImage = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $class_id);
@@ -101,7 +102,7 @@
 
 # Take off the absolute path, to stuff into the database
-$outputImage = File::Spec->abs2rel( $outputImage, $ipprc->workdir() );
-$outputBin1 = File::Spec->abs2rel( $outputBin1, $ipprc->workdir() );
-$outputBin2 = File::Spec->abs2rel( $outputBin2, $ipprc->workdir() );
+$outputImage = $ipprc->convert_filename ( $outputImage );
+$outputBin1  = $ipprc->convert_filename ( $outputBin1  );
+$outputBin2  = $ipprc->convert_filename ( $outputBin2  );
 
 # Add the processed file to the database
Index: trunk/ippScripts/scripts/detrend_reject_imfile.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_reject_imfile.pl	(revision 10398)
+++ trunk/ippScripts/scripts/detrend_reject_imfile.pl	(revision 10419)
@@ -71,5 +71,6 @@
 # Generate the file list, and get the statistics
 my $outputRoot = $exp_tag . '.detresid.' . $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
@@ -79,6 +80,6 @@
 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};
     ## calculate the root-mean-square of the bd_stdevs
@@ -194,6 +195,6 @@
 
 # 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 -addresidexp -det_id $det_id -iteration $iter -exp_tag $exp_tag " .
Index: trunk/ippScripts/scripts/detrend_resid.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_resid.pl	(revision 10398)
+++ trunk/ippScripts/scripts/detrend_resid.pl	(revision 10419)
@@ -85,7 +85,8 @@
 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,7 +124,7 @@
 
 # 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 " .
Index: trunk/ippScripts/scripts/detrend_stack.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_stack.pl	(revision 10398)
+++ trunk/ippScripts/scripts/detrend_stack.pl	(revision 10419)
@@ -76,5 +76,6 @@
 # Stack the files
 my $outputRoot = $camera . '.' . $det_type . '.' . $det_id . '.' . $iter . '.' . $class_id; # Root 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 $outputStack = $outputRoot . '.fits'; # Output name
 my $outputStats = $outputRoot . '.stats'; # Statistics name
@@ -83,5 +84,5 @@
     foreach my $file (@$files) {
 	my $uri = $file->{uri};	# URI for input file
-	$uri = File::Spec->rel2abs( $uri, $ipprc->workdir() );
+	$uri = $ipprc->convert_filename ($uri);
 	$command .= ' ' . $uri;
     }
@@ -113,5 +114,5 @@
 
 # Add the resultant into the database
-$outputStack = File::Spec->abs2rel( $outputStack, $ipprc->workdir() );
+$outputStack = $ipprc->convert_filename ($outputStack);
 unless ($no_update) {
     my $command = "$dettool -addstacked -det_id $det_id -iteration $iter -class_id $class_id" .
Index: trunk/ippScripts/scripts/phase0_imfile.pl
===================================================================
--- trunk/ippScripts/scripts/phase0_imfile.pl	(revision 10398)
+++ trunk/ippScripts/scripts/phase0_imfile.pl	(revision 10419)
@@ -86,5 +86,5 @@
 
 # Resolve the input URI
-$uri = File::Spec->rel2abs( $uri, $ipprc->workdir() );
+$uri = $ipprc->convert_filename ($uri);
 
 # Run ppStats on the input file
Index: trunk/ippScripts/scripts/phase2.pl
===================================================================
--- trunk/ippScripts/scripts/phase2.pl	(revision 10398)
+++ trunk/ippScripts/scripts/phase2.pl	(revision 10419)
@@ -52,6 +52,7 @@
 my ($vol, $dir, $file) = File::Spec->splitpath( $input );
 my $outputRoot =  $expTag . '.p2';
-$outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
-$input = File::Spec->rel2abs( $input, $ipprc->workdir() );
+$outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
+$outputRoot = $ipprc->convert_filename ($outputRoot);
+$input = $ipprc->convert_filename ( $input );
 my $outputImage = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $classId);
 my $outputBin1 = $ipprc->filename("PPIMAGE.BIN1", $outputRoot, $classId);
@@ -87,7 +88,7 @@
 
 # Add the processed file to the database
-$outputImage = File::Spec->abs2rel( $outputImage, $ipprc->workdir() );
-$outputBin1 = File::Spec->abs2rel( $outputBin1, $ipprc->workdir() );
-$outputBin2 = File::Spec->abs2rel( $outputBin2, $ipprc->workdir() );
+$outputImage = $ipprc->convert_filename ( $outputImage);
+$outputBin1  = $ipprc->convert_filename ( $outputBin1 );
+$outputBin2  = $ipprc->convert_filename ( $outputBin2 );
 unless ($no_update) {
     # Command to run dettool
Index: trunk/ippScripts/scripts/phase3.pl
===================================================================
--- trunk/ippScripts/scripts/phase3.pl	(revision 10398)
+++ trunk/ippScripts/scripts/phase3.pl	(revision 10419)
@@ -97,5 +97,6 @@
 # Generate the file list, and get the statistics
 my $outputRoot = $exp_tag . '.p3'; # 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
@@ -105,6 +106,6 @@
 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};
@@ -135,7 +136,7 @@
 
 # Add the result into the database
-$outputRoot = File::Spec->abs2rel( $outputRoot, $ipprc->workdir() );
-$jpeg1  = File::Spec->abs2rel( $jpeg1, $ipprc->workdir() );
-$jpeg2  = File::Spec->abs2rel( $jpeg2, $ipprc->workdir() );
+$outputRoot = $ipprc->convert_filename ($outputRoot);
+$jpeg1  = $ipprc->convert_filename ($jpeg1);
+$jpeg2  = $ipprc->convert_filename ($jpeg2);
 unless ($no_update) {
     my $command = "$p3tool -addprocessedexp -exp_tag $exp_tag -uri UNKNOWN " .
