Index: trunk/ippScripts/scripts/stack_skycell.pl
===================================================================
--- trunk/ippScripts/scripts/stack_skycell.pl	(revision 13668)
+++ trunk/ippScripts/scripts/stack_skycell.pl	(revision 13698)
@@ -113,8 +113,15 @@
     print $listFile "INPUT$num\tMETADATA\n";
     $num++;
-    print $listFile "\tIMAGE\tSTR\t" . $file->{uri} . "\n";
+
+    my $image = $file->{uri};	# Image name
+    my $mask = $ipprc->filename( "PSWARP.OUTPUT.MASK", $file->{path_base} ); # Mask name
+
+    &my_die("Image $image does not exist", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists( $image );
+    &my_die("Mask $mask does not exist", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists( $mask );
+   
+    print $listFile "\tIMAGE\tSTR\t" . $image . "\n";
+    print $listFile "\tMASK\tSTR\t" . $mask . "\n"; 
 
     ### XXX NEED TO UPDATE THESE appropriately
-#    print $listFile "\tMASK\tSTR\t" . "NULL" . "\n"; 
     print $listFile "\tSEEING\tF32\t" . 1.0 . "\n";
     print $listFile "\tWEIGHT\tF32\t" . 1.0 . "\n";
@@ -127,7 +134,8 @@
 $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 = $outputRoot . ".fits";
-#my $bin1Name =  $ipprc->filename("PPSTAC.BIN1", $outputRoot);
-#my $bin2Name =  $ipprc->filename("PPSTAC.BIN2", $outputRoot);
+my $outputName = $ipprc->filename("PPSTACK.OUTPUT", $outputRoot);
+my $outputMask = $ipprc->filename("PPSTACK.OUTPUT.MASK", $outputRoot);
+#my $bin1Name =  $ipprc->filename("PPSTACK.BIN1", $outputRoot);
+#my $bin2Name =  $ipprc->filename("PPSTACK.BIN2", $outputRoot);
 my $outputStats = $outputRoot . '.stats';
 
@@ -143,8 +151,9 @@
 	&my_die("Unable to perform ppImage: $error_code", $stack_id, $error_code);
     }
-    &my_die("Couldn't find expected output file: $outputName", $stack_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputName);
-#    &my_die("Couldn't find expected output file: $bin1Name",    $stack_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($bin1Name);
-#    &my_die("Couldn't find expected output file: $bin2Name",    $stack_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($bin2Name);
-    &my_die("Couldn't find expected output file: $outputStats", $stack_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputStats);
+    &my_die("Couldn't find expected output file: $outputName", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName);
+    &my_die("Couldn't find expected output file: $outputMask", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
+#    &my_die("Couldn't find expected output file: $bin1Name",    $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name);
+#    &my_die("Couldn't find expected output file: $bin2Name",    $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name);
+    &my_die("Couldn't find expected output file: $outputStats", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStats);
 
     # Get the statistics on the stacked image
@@ -166,5 +175,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 $outputRoot";
 	$command .= " -bg $bg -bg_stdev $bg_stdev";
 	$command .= " -dbname $dbname" if defined $dbname;
@@ -204,5 +213,5 @@
 	my $command = "$stacktool -updaterun -stack_id $stack_id -state stop -code $exit_code";
 	$command .= " -dbname $dbname" if defined $dbname;
-        system ($command);
+###        system ($command);
     }
     exit $exit_code;