Changeset 27838 for branches/tap_branches/ippScripts/scripts/stack_skycell.pl

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• ippScripts/scripts/stack_skycell.pl (modified) (11 diffs)

branches/tap_branches/ippScripts/scripts/stack_skycell.pl

@@ -8 +8 @@
 use Sys::Hostname;
 my $host = hostname();
+my $date = `date`;
 print "\n\n";
-print "Starting script $0 on $host\n\n";
+print "Starting script $0 on $host at $date\n\n";
 
 use DateTime;
@@ -107 +108 @@
 }
 
-&my_die("Stack list contains less than two elements", $stack_id, $PS_EXIT_SYS_ERROR) unless
+&my_die("Stack list contains less than two elements", $stack_id, $PS_EXIT_DATA_ERROR) unless
     scalar @$files >= 2;
 
@@ -120 +121 @@
     if ($file->{ignored}) { next; }
     if (defined $tess_id) {
-        &my_die("Tesselation identifiers don't match", $stack_id, $PS_EXIT_SYS_ERROR) unless
+        &my_die("Tesselation identifiers don't match", $stack_id, $PS_EXIT_DATA_ERROR) unless
             $file->{tess_id} eq $tess_id;
     } else {
@@ -126 +127 @@
     }
     if (defined $skycell_id) {
-        &my_die("Skycell identifiers don't match", $stack_id, $PS_EXIT_SYS_ERROR) unless
+        &my_die("Skycell identifiers don't match", $stack_id, $PS_EXIT_DATA_ERROR) unless
             $file->{skycell_id} eq $skycell_id;
     } else {
@@ -132 +133 @@
     }
     if (defined $camera) {
-        &my_die("Cameras don't match", $stack_id, $PS_EXIT_SYS_ERROR) unless $file->{camera} eq $camera;
+        &my_die("Cameras don't match", $stack_id, $PS_EXIT_DATA_ERROR) unless $file->{camera} eq $camera;
     } else {
         $camera = $file->{camera};
@@ -165 +166 @@
 }
 my $convolve = metadataLookupBool($recipe, 'CONVOLVE'); # Convolve inputs?
+my $photometry = metadataLookupBool($recipe, 'PHOTOMETRY'); # perform photometry?
 
 
@@ -205 +207 @@
 my $outputMask = $ipprc->filename("PPSTACK.OUTPUT.MASK", $outroot);
 my $outputWeight = $ipprc->filename("PPSTACK.OUTPUT.VARIANCE", $outroot);
-my $outputSources = $ipprc->filename("PSPHOT.OUT.CMF.MEF", $outroot); ## this must be consistent with the value in diff_skycell.pl:101
+my $outputSources = $photometry ? $ipprc->filename("PSPHOT.OUT.CMF.MEF", $outroot) : undef; ## this must be consistent with the value in diff_skycell.pl:101
+
 ## use an explicit stack name for psphot output objects
 #my $bin1Name =  $ipprc->filename("PPSTACK.BIN1", $outroot);
@@ -236 +239 @@
     $command .= " -F SOURCE.PLOT.PSFMODEL SOURCE.PLOT.SKY.PSFMODEL";
     $command .= " -F SOURCE.PLOT.APRESID SOURCE.PLOT.SKY.APRESID";
-    $command .= " -photometry";
     $command .= " -threads $threads" if defined $threads;
     $command .= " -debug-stack" if defined $debug;
@@ -260 +262 @@
     if ($do_stats) {
         my $outputStatsReal = $ipprc->file_resolve($outputStats);
-        &my_die("Couldn't find expected output file: $outputStats", $stack_id, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
+        &my_die("Couldn't find expected output file: $outputStats", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal);
 
         # measure stats
@@ -282 +284 @@
         &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: $outputWeight", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight);
-        &my_die("Couldn't find expected output file: $outputSources", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
+        if ($photometry) {
+            &my_die("Couldn't find expected output file: $outputSources", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
+        }
+        if ($run_state eq 'new') {
+            &my_die("Couldn't find expected output file: $configuration", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($configuration);
+        }
 #       &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);
@@ -367 +374 @@
     my $temp_delete = defined($recipe) and metadataLookupBool($recipe, 'TEMP.DELETE'); # Delete temp files?
     if ($temp_delete) {
-        my $temp_dir = metadataLookupStr($recipe, 'TEMP.DIR'); # Directory with temporary files
+        my $temp_dir = metadataLookupStr($ipprc->{_siteConfig}, 'TEMP.DIR') or &my_die("Unable to find temporary directory in site configuration", $stack_id, $PS_EXIT_CONFIG_ERROR); # Directory with temporary files
         my $temp_image = metadataLookupStr($recipe, 'TEMP.IMAGE'); # Suffix for image
         my $temp_mask = metadataLookupStr($recipe, 'TEMP.MASK'); # Suffix for mask