Index: trunk/ippScripts/scripts/detrend_norm_apply.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_norm_apply.pl	(revision 10530)
+++ trunk/ippScripts/scripts/detrend_norm_apply.pl	(revision 10534)
@@ -59,10 +59,10 @@
 
 my ($vol, $dir, $file) = File::Spec->splitpath( $input );
-$input = $ipprc->convert_filename ( $input );
+$input = $ipprc->convert_filename_absolute( $input );
 
 # Output name
 my $outputRoot = $camera . '.' . $detType . '.norm.' . $detId . '.' . $iter; # Root output name
 $outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
-$outputRoot = $ipprc->convert_filename ($outputRoot);
+$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
 
 my $output = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $classId);
@@ -100,7 +100,7 @@
 
 # Update the database
-$output = $ipprc->convert_filename ( $output );
-$b1name = $ipprc->convert_filename ( $b1name );
-$b2name = $ipprc->convert_filename ( $b2name );
+$output = $ipprc->convert_filename_relative( $output );
+$b1name = $ipprc->convert_filename_relative( $b1name );
+$b2name = $ipprc->convert_filename_relative( $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 10530)
+++ trunk/ippScripts/scripts/detrend_norm_exp.pl	(revision 10534)
@@ -96,5 +96,5 @@
 my $outputRoot = $camera . '.' . $det_type . '.norm.' . $det_id . '.' . $iter; # Root output name
 $outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
-$outputRoot = $ipprc->convert_filename ($outputRoot);
+$outputRoot = $ipprc->convert_filename_absolute( $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
@@ -104,6 +104,6 @@
 open my $list2File, '>' . $list2Name;
 foreach my $file (@$files) {
-    print $list1File ($ipprc->convert_filename ( $file->{b1_uri} ) . "\n");
-    print $list2File ($ipprc->convert_filename ( $file->{b2_uri} ) . "\n");
+    print $list1File ($ipprc->convert_filename_absolute( $file->{b1_uri} ) . "\n");
+    print $list2File ($ipprc->convert_filename_absolute( $file->{b2_uri} ) . "\n");
     push @means, $file->{bg};
     push @stdevs, $file->{bg_stdev};
@@ -133,6 +133,6 @@
 
 # Add the result into the database
-$jpeg1Name = $ipprc->convert_filename ( $jpeg1Name );
-$jpeg2Name = $ipprc->convert_filename ( $jpeg2Name );
+$jpeg1Name = $ipprc->convert_filename_relative( $jpeg1Name );
+$jpeg2Name = $ipprc->convert_filename_relative( $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 10530)
+++ trunk/ippScripts/scripts/detrend_process_exp.pl	(revision 10534)
@@ -94,5 +94,5 @@
 my $outputRoot = $exp_tag . '.detproc.' . $det_id; # Root output name
 $outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
-$outputRoot = $ipprc->convert_filename ($outputRoot);
+$outputRoot = $ipprc->convert_filename_absolute($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
@@ -102,6 +102,6 @@
 open my $list2File, '>' . $list2Name;
 foreach my $file (@$files) {
-    print $list1File ($ipprc->convert_filename ( $file->{b1_uri} ) . "\n");
-    print $list2File ($ipprc->convert_filename ( $file->{b2_uri} ) . "\n");
+    print $list1File ($ipprc->convert_filename_absolute( $file->{b1_uri} ) . "\n");
+    print $list2File ($ipprc->convert_filename_absolute( $file->{b2_uri} ) . "\n");
     push @means, $file->{bg};
     push @stdevs, $file->{bg_stdev};
@@ -132,7 +132,7 @@
 
 # Add the result into the database
-$outputRoot = $ipprc->convert_filename ( $outputRoot );
-$jpeg1  = $ipprc->convert_filename ( $jpeg1 );
-$jpeg2  = $ipprc->convert_filename ( $jpeg2 );
+$outputRoot = $ipprc->convert_filename_relative( $outputRoot );
+$jpeg1  = $ipprc->convert_filename_relative( $jpeg1 );
+$jpeg2  = $ipprc->convert_filename_relative( $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 10530)
+++ trunk/ippScripts/scripts/detrend_process_imfile.pl	(revision 10534)
@@ -65,6 +65,6 @@
 my $outputRoot = $exp_tag . '.detproc.' . $det_id; # Root name
 $outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
-$outputRoot = $ipprc->convert_filename ($outputRoot);
-$input_uri = $ipprc->convert_filename ( $input_uri );
+$outputRoot = $ipprc->convert_filename_absolute( $outputRoot );
+$input_uri = $ipprc->convert_filename_absolute( $input_uri );
 
 my $outputImage = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $class_id);
@@ -102,7 +102,7 @@
 
 # Take off the absolute path, to stuff into the database
-$outputImage = $ipprc->convert_filename ( $outputImage );
-$outputBin1  = $ipprc->convert_filename ( $outputBin1  );
-$outputBin2  = $ipprc->convert_filename ( $outputBin2  );
+$outputImage = $ipprc->convert_filename_relative( $outputImage );
+$outputBin1  = $ipprc->convert_filename_relative( $outputBin1  );
+$outputBin2  = $ipprc->convert_filename_relative( $outputBin2  );
 
 # Add the processed file to the database
Index: trunk/ippScripts/scripts/detrend_resid.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_resid.pl	(revision 10530)
+++ trunk/ippScripts/scripts/detrend_resid.pl	(revision 10534)
@@ -86,7 +86,7 @@
 my $outputRoot = $exp_tag . '.detresid.' . $det_id . '.' . $iter; # Root name
 $outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
-$outputRoot = $ipprc->convert_filename ( $outputRoot );
-$input_uri = $ipprc->convert_filename ( $input_uri );
-$detrend = $ipprc->convert_filename ( $detrend );
+$outputRoot = $ipprc->convert_filename_absolute( $outputRoot );
+$input_uri = $ipprc->convert_filename_absolute( $input_uri );
+$detrend = $ipprc->convert_filename_absolute( $detrend );
 
 my $outputName = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $class_id);
@@ -124,7 +124,7 @@
 
 # Add the processed file to the database
-$outputName = $ipprc->convert_filename ( $outputName );
-$bin1Name = $ipprc->convert_filename ( $bin1Name );
-$bin2Name = $ipprc->convert_filename ( $bin2Name );
+$outputName = $ipprc->convert_filename_relative( $outputName );
+$bin1Name = $ipprc->convert_filename_relative( $bin1Name );
+$bin2Name = $ipprc->convert_filename_relative( $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 10530)
+++ trunk/ippScripts/scripts/detrend_stack.pl	(revision 10534)
@@ -77,5 +77,5 @@
 my $outputRoot = $camera . '.' . $det_type . '.' . $det_id . '.' . $iter . '.' . $class_id; # Root name
 $outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
-$outputRoot = $ipprc->convert_filename ($outputRoot);
+$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
 my $outputStack = $outputRoot . '.fits'; # Output name
 my $outputStats = $outputRoot . '.stats'; # Statistics name
@@ -84,5 +84,5 @@
     foreach my $file (@$files) {
 	my $uri = $file->{uri};	# URI for input file
-	$uri = $ipprc->convert_filename ($uri);
+	$uri = $ipprc->convert_filename_absolute($uri);
 	$command .= ' ' . $uri;
     }
@@ -114,5 +114,5 @@
 
 # Add the resultant into the database
-$outputStack = $ipprc->convert_filename ($outputStack);
+$outputStack = $ipprc->convert_filename_relative($outputStack);
 unless ($no_update) {
     my $command = "$dettool -addstacked -det_id $det_id -iteration $iter -class_id $class_id" .
Index: trunk/ippScripts/scripts/ipp_datapath.pl
===================================================================
--- trunk/ippScripts/scripts/ipp_datapath.pl	(revision 10530)
+++ trunk/ippScripts/scripts/ipp_datapath.pl	(revision 10534)
@@ -8,5 +8,5 @@
 use PS::IPP::Config;
 my $ipprc = PS::IPP::Config->new();
-print $ipprc->convert_filename(shift @ARGV) . "\n";
+print $ipprc->convert_filename_absolute(shift @ARGV) . "\n";
 
 1;
Index: trunk/ippScripts/scripts/phase0_exp.pl
===================================================================
--- trunk/ippScripts/scripts/phase0_exp.pl	(revision 10530)
+++ trunk/ippScripts/scripts/phase0_exp.pl	(revision 10534)
@@ -31,5 +31,5 @@
 # Define setup
 use constant TYPE => "exp_type"; # Observation type keyword
-use constant DETRENDS => [ "bias", "dark", "shutter", "flat", "fringe" ]; # Observation types to mark as detrend
+use constant DETRENDS => [ "bias", "zero", "dark", "shutter", "flat", "fringe" ]; # Observation types to mark as detrend
 use constant DETREND_FLAG => "-detrend"; # Flag to use to mark detrend exposure
 
@@ -154,5 +154,5 @@
     # Add the detrend flag
     foreach my $detrendType (@{DETRENDS()}) {
-        if (lc($values{TYPE()}) eq lc($detrendType)) {
+        if (lc($values{TYPE()}) =~ /$detrendType/) {
 	    push @command, DETREND_FLAG;
             last;
Index: trunk/ippScripts/scripts/phase0_imfile.pl
===================================================================
--- trunk/ippScripts/scripts/phase0_imfile.pl	(revision 10530)
+++ trunk/ippScripts/scripts/phase0_imfile.pl	(revision 10534)
@@ -86,5 +86,5 @@
 
 # Resolve the input URI
-$uri = $ipprc->convert_filename ($uri);
+$uri = $ipprc->convert_filename_absolute($uri);
 
 # Run ppStats on the input file
Index: trunk/ippScripts/scripts/phase2.pl
===================================================================
--- trunk/ippScripts/scripts/phase2.pl	(revision 10530)
+++ trunk/ippScripts/scripts/phase2.pl	(revision 10534)
@@ -53,9 +53,9 @@
 my $outputRoot =  $expTag . '.p2';
 $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);
-my $outputBin2 = $ipprc->filename("PPIMAGE.BIN2", $outputRoot, $classId);
+$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
+$input = $ipprc->convert_filename_absolute ( $input );
+my $outputImage = $ipprc->filename_absolute("PPIMAGE.OUTPUT", $outputRoot, $classId);
+my $outputBin1 = $ipprc->filename_absolute("PPIMAGE.BIN1", $outputRoot, $classId);
+my $outputBin2 = $ipprc->filename_absolute("PPIMAGE.BIN2", $outputRoot, $classId);
 my $outputStats = $outputRoot  . '.' . $classId . '.stats';
 
@@ -88,7 +88,7 @@
 
 # Add the processed file to the database
-$outputImage = $ipprc->convert_filename ( $outputImage);
-$outputBin1  = $ipprc->convert_filename ( $outputBin1 );
-$outputBin2  = $ipprc->convert_filename ( $outputBin2 );
+$outputImage = $ipprc->convert_filename_relative( $outputImage);
+$outputBin1  = $ipprc->convert_filename_relative( $outputBin1 );
+$outputBin2  = $ipprc->convert_filename_relative( $outputBin2 );
 unless ($no_update) {
     # Command to run dettool
Index: trunk/ippScripts/scripts/phase3.pl
===================================================================
--- trunk/ippScripts/scripts/phase3.pl	(revision 10530)
+++ trunk/ippScripts/scripts/phase3.pl	(revision 10534)
@@ -98,5 +98,5 @@
 my $outputRoot = $exp_tag . '.p3'; # Root output name
 $outputRoot = File::Spec->catpath( $vol, $dir, $outputRoot );
-$outputRoot = $ipprc->convert_filename ($outputRoot);
+$outputRoot = $ipprc->convert_filename_absolute($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
@@ -106,6 +106,6 @@
 open my $list2File, '>' . $list2Name;
 foreach my $file (@$files) {
-    print $list1File ($ipprc->convert_filename ($file->{b1_uri}) . "\n");
-    print $list2File ($ipprc->convert_filename ($file->{b2_uri}) . "\n");
+    print $list1File ($ipprc->convert_filename_absolute($file->{b1_uri}) . "\n");
+    print $list2File ($ipprc->convert_filename_absolute($file->{b2_uri}) . "\n");
     push @means, $file->{bg};
     push @stdevs, $file->{bg_stdev};
@@ -136,7 +136,7 @@
 
 # Add the result into the database
-$outputRoot = $ipprc->convert_filename ($outputRoot);
-$jpeg1  = $ipprc->convert_filename ($jpeg1);
-$jpeg2  = $ipprc->convert_filename ($jpeg2);
+$outputRoot = $ipprc->convert_filename_relative($outputRoot);
+$jpeg1  = $ipprc->convert_filename_relative($jpeg1);
+$jpeg2  = $ipprc->convert_filename_relative($jpeg2);
 unless ($no_update) {
     my $command = "$p3tool -addprocessedexp -exp_tag $exp_tag -uri UNKNOWN " .