Changeset 14274

Timestamp:

Jul 17, 2007, 1:53:14 PM (19 years ago)

Author:

Paul Price

Message:

Using weight maps in ppStack. Adding flag to preserve temporary files.

Location:

trunk/ippScripts/scripts

Files:

• ipp_serial_stack.pl (modified) (3 diffs)
• stack_skycell.pl (modified) (8 diffs)

trunk/ippScripts/scripts/ipp_serial_stack.pl

@@ -28 +28 @@
     $no_op,                     # No operations?
     $no_update,                 # No updating?
+    $save_temps,                # Save temporary files?
     );
 GetOptions(
@@ -33 +34 @@
            'no-op' => \$no_op,
            'no-update' => \$no_update,
+           'save-temps' => \$save_temps,
 ) or pod2usage( 2 );
 
@@ -74 +76 @@
         $command .= " --no-op" if defined $no_op;
         $command .= " --no-update" if defined $no_update;
+        $command .= " --save-temps" if defined $save_temps;
         $command .= " --workdir $workdir" if defined $workdir;
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =

trunk/ippScripts/scripts/stack_skycell.pl

@@ -34 +34 @@
 use Pod::Usage qw( pod2usage );
 
-my ($stack_id, $dbname, $workdir, $no_update, $no_op);
+my ($stack_id, $dbname, $workdir, $no_update, $no_op, $save_temps);
 GetOptions(
     'stack_id|d=s'      => \$stack_id, # Stack identifier
@@ -41 +41 @@
     'no-update'         => \$no_update, # Don't update the database?
     'no-op'             => \$no_op, # Don't do any operations?
+    'save-temps'        => \$save_temps, # Save temporary files?
 ) or pod2usage( 2 );
 
@@ -116 +117 @@
 
 # Generate MDC file with the inputs
-my ($listFile, $listName) = tempfile( "$tess_id.$skycell_id.stk$stack_id.list.XXXX", UNLINK => 1 );
+my ($listFile, $listName) = tempfile( "$tess_id.$skycell_id.stk$stack_id.list.XXXX",
+                                      UNLINK => !$save_temps );
 my $num = 0;
 foreach my $file (@$files) {
@@ -124 +126 @@
     my $image = $file->{uri};   # Image name
     my $mask = $ipprc->filename( "PSWARP.OUTPUT.MASK", $file->{path_base} ); # Mask name
+    my $weight = $ipprc->filename( "PSWARP.OUTPUT.WEIGHT", $file->{path_base} ); # Weight name
 
     &my_die("Image $image does not exist", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists( $image );
@@ -130 +133 @@
     print $listFile "\tIMAGE\tSTR\t" . $image . "\n";
     print $listFile "\tMASK\tSTR\t" . $mask . "\n"; 
+    print $listFile "\tWEIGHT\tSTR\t" . $weight . "\n"; 
 
     ### XXX NEED TO UPDATE THESE appropriately
     print $listFile "\tSEEING\tF32\t" . 1.0 . "\n";
-    print $listFile "\tWEIGHT\tF32\t" . 1.0 . "\n";
+    print $listFile "\tWEIGHTING\tF32\t" . 1.0 . "\n";
     print $listFile "\tSCALE\tF32\t" . 1.0 . "\n";
 
@@ -144 +148 @@
 my $outputName = $ipprc->filename("PPSTACK.OUTPUT", $outputRoot);
 my $outputMask = $ipprc->filename("PPSTACK.OUTPUT.MASK", $outputRoot);
+my $outputWeight = $ipprc->filename("PPSTACK.OUTPUT.WEIGHT", $outputRoot);
 #my $bin1Name =  $ipprc->filename("PPSTACK.BIN1", $outputRoot);
 #my $bin2Name =  $ipprc->filename("PPSTACK.BIN2", $outputRoot);
@@ -152 +157 @@
     my $command = "$ppStack $listName $outputRoot";
     $command .= " -stats $outputStats";
-    $command .= " -recipe PPSTATS CHIPSTATS";
+    $command .= " -recipe PPSTATS WARPSTATS";
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -162 +167 @@
     &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: $outputWeight", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight);
 #    &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);