Index: trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm
===================================================================
--- trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm	(revision 39192)
+++ trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm	(revision 39209)
@@ -746,5 +746,9 @@
         my $mask_base;
         if ($want_astrom) {
-            if ($selectedAstrom) {
+            if ($out->{cam_path_base}) {
+                # XXX Cheating here
+                my $astromSource = 'PSASTRO.OUTPUT';
+                $out->{astrom} = $ipprc->filename($astromSource, $out->{cam_path_base});
+            } elsif ($selectedAstrom) {
                 $out->{astrom} = $selectedAstrom;
                 $out->{cam_path_base} = $selectedAstrom;
@@ -763,4 +767,5 @@
                 }
             }
+            # XXX: cheating here
             # XXX: do this right by looking at the recipe
             $mask_base = $out->{cam_path_base};
@@ -1471,5 +1476,5 @@
     if (!$astromSource) {
         if ($camera eq "GPC1") {
-            # CHEATER !
+            # XXX: CHEATER !
             $astromSource = "PSASTRO.OUTPUT";
         } else {
@@ -1489,5 +1494,5 @@
     }
 
-    # XXX: Is this code correct if ASTROM.SOURCE ne "PSASTRO.OUTPUT"
+    # XXX: Is this code correct if ASTROM.SOURCE ne "PSASTRO.OUTPUT" ?
     my $astromFile = $ipprc->filename($astromSource, $camRoot);
     if (!$astromFile) {
@@ -1939,5 +1944,6 @@
     my $now = gettimeofday();
     my $dtime_tool = $now - $start_tool;
-    print "Time to run $program: $dtime_tool\n";
+    # XXX: shouldn't this be if $verbose?
+    print "Time to run $program: $dtime_tool\n" ; # if $verbose;
 
     my $buf = join "", @$stdout_buf;
@@ -1953,5 +1959,6 @@
 
     my $dtime_parse = gettimeofday() - $start_parse;
-    print "Time to parse results from $program: $dtime_parse\n";
+    # XXX: shouldn't this be if $verbose?
+    print "Time to parse results from $program: $dtime_parse\n" ; # if $verbose;
 
     return $results;