Index: trunk/ippScripts/scripts/warp_skycell.pl
===================================================================
--- trunk/ippScripts/scripts/warp_skycell.pl	(revision 12218)
+++ trunk/ippScripts/scripts/warp_skycell.pl	(revision 12421)
@@ -84,7 +84,8 @@
 }
 
-### Output file name
+# Set output directory
 if (defined $workdir) {
     $workdir = $ipprc->convert_filename_absolute( $workdir );
+    $workdir = File::Spec->catdir( $workdir, "tess_" . $tess_id, "sky_" . $skycell_id );
 } else {
     my $example = $ipprc->convert_filename_absolute( $$imfiles[0]->{uri} );
@@ -92,9 +93,7 @@
     $workdir = $dir;
 }
-
-$workdir = File::Spec->catfile( $workdir, "sky$skycell_id" );
 system "mkdir -p $workdir" unless -d $workdir;
 
-my $outputFile = "sky$skycell_id.wrp$warp_id"; # Root name
+my $outputFile = "$tess_id.$skycell_id.wrp$warp_id"; # Root name
 my $outputRoot = File::Spec->catfile( $workdir, $outputFile );
 my $outputImage = $ipprc->filename("PSWARP.OUTPUT", $outputRoot, $skycell_id );