Index: trunk/ippScripts/scripts/stack_skycell.pl
===================================================================
--- trunk/ippScripts/scripts/stack_skycell.pl	(revision 16722)
+++ trunk/ippScripts/scripts/stack_skycell.pl	(revision 16740)
@@ -34,9 +34,9 @@
 use Pod::Usage qw( pod2usage );
 
-my ($stack_id, $dbname, $workdir, $verbose, $no_update, $no_op, $save_temps);
+my ($stack_id, $dbname, $outroot, $verbose, $no_update, $no_op, $save_temps);
 GetOptions(
     'stack_id|d=s'      => \$stack_id, # Stack identifier
     'dbname|d=s'        => \$dbname, # Database name
-    'workdir|w=s'       => \$workdir,	# Working directory, for output files
+    'outroot=s'         => \$outroot, # Output root name
     'verbose'           => \$verbose,   # Print to stdout
     'no-update'         => \$no_update,	# Don't update the database?
@@ -49,5 +49,6 @@
     -msg => "Required options: --stack_id",
     -exitval => 3,
-	  ) unless defined $stack_id;
+	  ) unless defined $stack_id
+    and defined $outroot;
 
 my $STATS = 
@@ -161,20 +162,17 @@
 
 # Get the output filenames
-$workdir = caturi( $workdir, "tess_" . $tess_id, "sky_" . $skycell_id ) if defined $workdir;
-my $outputRoot = $ipprc->file_prepare( "$tess_id.$skycell_id.stk$stack_id", $workdir, $$files[0]->{uri} );
-my $outputName = $ipprc->filename("PPSTACK.OUTPUT", $outputRoot);
-my $outputMask = $ipprc->filename("PPSTACK.OUTPUT.MASK", $outputRoot);
-my $outputWeight = $ipprc->filename("PPSTACK.OUTPUT.WEIGHT", $outputRoot);
-my $outputSources = $ipprc->filename("PSPHOT.OUTPUT", $outputRoot, "none");
-#my $bin1Name =  $ipprc->filename("PPSTACK.BIN1", $outputRoot);
-#my $bin2Name =  $ipprc->filename("PPSTACK.BIN2", $outputRoot);
-my $outputStats = $outputRoot . '.stats';
-
-my $traceDest = 'file:' . $ipprc->file_resolve($outputRoot) . ".trace"; # Trace messages
-my $logDest = 'file:' . $ipprc->file_resolve($outputRoot) . ".log"; # Log messages
+my $outputName = $ipprc->filename("PPSTACK.OUTPUT", $outroot);
+my $outputMask = $ipprc->filename("PPSTACK.OUTPUT.MASK", $outroot);
+my $outputWeight = $ipprc->filename("PPSTACK.OUTPUT.WEIGHT", $outroot);
+my $outputSources = $ipprc->filename("PSPHOT.OUTPUT", $outroot, "none");
+#my $bin1Name =  $ipprc->filename("PPSTACK.BIN1", $outroot);
+#my $bin2Name =  $ipprc->filename("PPSTACK.BIN2", $outroot);
+my $outputStats = $ipprc->filename("SKYCELL.STATS", $outroot);
+my $traceDest = $ipprc->filename("TRACE.EXP", $outroot);
+my $logDest = $ipprc->filename("LOG.EXP", $outroot);
 
 # Perform stacking
 unless ($no_op) {
-    my $command = "$ppStack $listName $outputRoot";
+    my $command = "$ppStack $listName $outroot";
     $command .= " -stats $outputStats";
     $command .= " -recipe PPSTATS WARPSTATS";
@@ -211,5 +209,5 @@
     # Add the stack result
     {
-	my $command = "$stacktool -addsumskyfile -stack_id $stack_id -uri $outputName -path_base $outputRoot";
+	my $command = "$stacktool -addsumskyfile -stack_id $stack_id -uri $outputName -path_base $outroot";
 	$command .= $stats->cmdflags();
 	$command .= " -dbname $dbname" if defined $dbname;