Changeset 21371

Timestamp:

Feb 5, 2009, 5:15:21 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. No conflicts. Not tested.

Location:

trunk/ippScripts/scripts

Files:

• chip_imfile.pl (modified) (2 diffs)
• detrend_stack.pl (modified) (2 diffs)
• diff_skycell.pl (modified) (3 diffs)
• fake_imfile.pl (modified) (1 diff)
• ipp_cleanup.pl (modified) (2 diffs)
• magic_destreak.pl (modified) (1 diff)
• magic_process.pl (modified) (1 diff)
• stack_skycell.pl (modified) (4 diffs)
• warp_skycell.pl (modified) (3 diffs)

trunk/ippScripts/scripts/chip_imfile.pl

@@ -107 +107 @@
 my $outputImage   = $ipprc->filename("PPIMAGE.CHIP",        $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
 my $outputMask    = $ipprc->filename("PPIMAGE.CHIP.MASK",   $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
-my $outputWeight  = $ipprc->filename("PPIMAGE.CHIP.WEIGHT", $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
+my $outputWeight  = $ipprc->filename("PPIMAGE.CHIP.VARIANCE", $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
 my $outputBin1    = $ipprc->filename("PPIMAGE.BIN1",        $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
 my $outputBin2    = $ipprc->filename("PPIMAGE.BIN2",        $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
@@ -181 +181 @@
     }
 
-    my $outputWeightExpect = metadataLookupBool($recipeData, 'CHIP.WEIGHT.FITS');
+    my $outputWeightExpect = metadataLookupBool($recipeData, 'CHIP.VARIANCE.FITS');
     if ($outputWeightExpect) {
         &my_die("Couldn't find expected output file: $outputWeight\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight);

trunk/ippScripts/scripts/detrend_stack.pl

@@ -155 +155 @@
     my $image = $file->{uri};   # Image name
     my $mask = $ipprc->filename( "PPIMAGE.OUTPUT.MASK", $file->{path_base}, $class_id ); # Mask name
-    my $weight = $ipprc->filename( "PPIMAGE.OUTPUT.WEIGHT", $file->{path_base}, $class_id ); # Weight name
+    my $weight = $ipprc->filename( "PPIMAGE.OUTPUT.VARIANCE", $file->{path_base}, $class_id ); # Weight name
 
     &my_die("Image $image does not exist", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists( $image );
@@ -164 +164 @@
     }
     if ($ipprc->file_exists( $weight )) {
-        print $listFile "\tWEIGHT\tSTR\t" . $weight . "\n";
+        print $listFile "\tVARIANCE\tSTR\t" . $weight . "\n";
     }
 

trunk/ippScripts/scripts/diff_skycell.pl

@@ -103 +103 @@
         if ($file->{warp_id} == 0) {
             $templateMask = "PPSTACK.OUTPUT.MASK";
-            $templateWeight = "PPSTACK.OUTPUT.WEIGHT";
+            $templateWeight = "PPSTACK.OUTPUT.VARIANCE";
             $templateSources = "PSPHOT.OUT.CMF.MEF";  ## this must be consistent with the value in stack_skycell.pl:161
             ## use an explicit stack name for psphot output objects
         } else {
             $templateMask = "PSWARP.OUTPUT.MASK";
-            $templateWeight = "PSWARP.OUTPUT.WEIGHT";
+            $templateWeight = "PSWARP.OUTPUT.VARIANCE";
             $templateSources = "PSWARP.OUTPUT.SOURCES";
         }
@@ -116 +116 @@
         if ($file->{warp_id} == 0) {
             $inputMask = "PPSTACK.OUTPUT.MASK";
-            $inputWeight = "PPSTACK.OUTPUT.WEIGHT";
+            $inputWeight = "PPSTACK.OUTPUT.VARIANCE";
         } else {
             $inputMask = "PSWARP.OUTPUT.MASK";
-            $inputWeight = "PSWARP.OUTPUT.WEIGHT";
+            $inputWeight = "PSWARP.OUTPUT.VARIANCE";
         }
     }
@@ -188 +188 @@
 my $outputName = $ipprc->filename("PPSUB.OUTPUT", $outroot);
 my $outputMask = $ipprc->filename("PPSUB.OUTPUT.MASK", $outroot);
-my $outputWeight = $ipprc->filename("PPSUB.OUTPUT.WEIGHT", $outroot);
+my $outputWeight = $ipprc->filename("PPSUB.OUTPUT.VARIANCE", $outroot);
 my $configuration = $ipprc->filename("PPSUB.CONFIG", $outroot);
 my $outputSources = $ipprc->filename("PSPHOT.OUT.CMF.MEF", $outroot);

trunk/ippScripts/scripts/fake_imfile.pl

@@ -108 +108 @@
 my $chipImage     = $ipprc->filename("PPIMAGE.CHIP",        $chiproot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $fake_id, $class_id, $PS_EXIT_CONFIG_ERROR);
 my $chipMask      = $ipprc->filename("PPIMAGE.CHIP.MASK",   $chiproot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $fake_id, $class_id, $PS_EXIT_CONFIG_ERROR);
-my $chipWeight    = $ipprc->filename("PPIMAGE.CHIP.WEIGHT", $chiproot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $fake_id, $class_id, $PS_EXIT_CONFIG_ERROR);
+my $chipWeight    = $ipprc->filename("PPIMAGE.CHIP.VARIANCE", $chiproot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $fake_id, $class_id, $PS_EXIT_CONFIG_ERROR);
 my $chipPSF       = $ipprc->filename("PSPHOT.PSF.SAVE",     $chiproot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $fake_id, $class_id, $PS_EXIT_CONFIG_ERROR);
 my $cameraObjects = $ipprc->filename("PSASTRO.OUTPUT",      $camroot)             or &my_die("Missing entry from camera config", $exp_id, $fake_id, $class_id, $PS_EXIT_CONFIG_ERROR);

trunk/ippScripts/scripts/ipp_cleanup.pl

@@ -109 +109 @@
             addFilename (\@files, "PPIMAGE.OUTPUT", $path_base, $class_id);
             addFilename (\@files, "PPIMAGE.OUTPUT.MASK", $path_base, $class_id);
-            addFilename (\@files, "PPIMAGE.OUTPUT.WEIGHT", $path_base, $class_id);
+            addFilename (\@files, "PPIMAGE.OUTPUT.VARIANCE", $path_base, $class_id);
             addFilename (\@files, "PPIMAGE.CHIP", $path_base, $class_id);
             addFilename (\@files, "PPIMAGE.CHIP.MASK", $path_base, $class_id);
-            addFilename (\@files, "PPIMAGE.CHIP.WEIGHT", $path_base, $class_id);
+            addFilename (\@files, "PPIMAGE.CHIP.VARIANCE", $path_base, $class_id);
             if ($mode eq "goto_purged") {
                 # additional files to remove for 'purge' mode
@@ -277 +277 @@
             addFilename(\@files, "PSWARP.OUTPUT", $path_base, $skycell_id );
             addFilename(\@files, "PSWARP.OUTPUT.MASK", $path_base, $skycell_id);
-            addFilename(\@files, "PSWARP.OUTPUT.WEIGHT", $path_base, $skycell_id);
+            addFilename(\@files, "PSWARP.OUTPUT.VARIANCE", $path_base, $skycell_id);
             addFilename(\@files, "PSWARP.OUTPUT.SOURCES", $path_base, $skycell_id);
 

trunk/ippScripts/scripts/magic_destreak.pl

@@ -190 +190 @@
     $mask   = $ipprc->filename("PSASTRO.OUTPUT.MASK", $cam_path_base, $class_id);
     $ch_mask= $ipprc->filename("PPIMAGE.CHIP.MASK", $path_base, $class_id);
-    $weight = $ipprc->filename("PPIMAGE.CHIP.WEIGHT", $path_base, $class_id);
+    $weight = $ipprc->filename("PPIMAGE.CHIP.VARIANCE", $path_base, $class_id);
     $astrom = $ipprc->filename("PSASTRO.OUTPUT", $cam_path_base);
 } elsif ($stage eq "warp") {
     $mask   = $ipprc->filename("PSWARP.OUTPUT.MASK", $path_base);
-    $weight = $ipprc->filename("PSWARP.OUTPUT.WEIGHT", $path_base);
+    $weight = $ipprc->filename("PSWARP.OUTPUT.VARIANCE", $path_base);
 } elsif ($stage eq "diff") {
     $mask   = $ipprc->filename("PPSUB.OUTPUT.MASK", $path_base);
-    $weight = $ipprc->filename("PPSUB.OUTPUT.WEIGHT", $path_base);
+    $weight = $ipprc->filename("PPSUB.OUTPUT.VARIANCE", $path_base);
 }
 

trunk/ippScripts/scripts/magic_process.pl

@@ -317 +317 @@
     my $image = $ipprc->file_resolve($ipprc->filename("PPSUB.OUTPUT", $input_base));
     my $mask = $ipprc->file_resolve($ipprc->filename("PPSUB.OUTPUT.MASK", $input_base));
-    my $weight= $ipprc->file_resolve($ipprc->filename("PPSUB.OUTPUT.WEIGHT", $input_base));
+    my $weight= $ipprc->file_resolve($ipprc->filename("PPSUB.OUTPUT.VARIANCE", $input_base));
 
     return ($image, $mask, $weight);

trunk/ippScripts/scripts/stack_skycell.pl

@@ -160 +160 @@
     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 $weight = $ipprc->filename( "PSWARP.OUTPUT.VARIANCE", $file->{path_base} ); # Weight name
     my $psf = $ipprc->filename( "PSPHOT.PSF.SKY.SAVE", $file->{path_base} ); # PSF name
     my $sources = $ipprc->filename("PSWARP.OUTPUT.SOURCES", $file->{path_base}); # Sources name
@@ -172 +172 @@
     print $listFile "\tIMAGE\tSTR\t" . $image . "\n";
     print $listFile "\tMASK\tSTR\t" . $mask . "\n";
-    print $listFile "\tWEIGHT\tSTR\t" . $weight . "\n";
+    print $listFile "\tVARIANCE\tSTR\t" . $weight . "\n";
     print $listFile "\tPSF\tSTR\t" . $psf . "\n";
     print $listFile "\tSOURCES\tSTR\t" . $sources . "\n";
@@ -185 +185 @@
 my $outputName = $ipprc->filename("PPSTACK.OUTPUT", $outroot);
 my $outputMask = $ipprc->filename("PPSTACK.OUTPUT.MASK", $outroot);
-my $outputWeight = $ipprc->filename("PPSTACK.OUTPUT.WEIGHT", $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
 ## use an explicit stack name for psphot output objects
@@ -344 +344 @@
         my $temp_image = metadataLookupStr($md, 'TEMP.IMAGE'); # Suffix for image
         my $temp_mask = metadataLookupStr($md, 'TEMP.MASK'); # Suffix for mask
-        my $temp_weight = metadataLookupStr($md, 'TEMP.WEIGHT'); # Suffix for weight
+        my $temp_weight = metadataLookupStr($md, 'TEMP.VARIANCE'); # Suffix for weight
         my $temp_root = basename($outroot); # Root name for temporary files
 

trunk/ippScripts/scripts/warp_skycell.pl

@@ -114 +114 @@
 my $outputImage = $ipprc->filename("PSWARP.OUTPUT", $outroot, $skycell_id );
 my $outputMask = $ipprc->filename("PSWARP.OUTPUT.MASK", $outroot, $skycell_id);
-my $outputWeight = $ipprc->filename("PSWARP.OUTPUT.WEIGHT", $outroot, $skycell_id);
+my $outputWeight = $ipprc->filename("PSWARP.OUTPUT.VARIANCE", $outroot, $skycell_id);
 my $outputSources = $ipprc->filename("PSWARP.OUTPUT.SOURCES", $outroot, $skycell_id);
 my $outputPSF = $ipprc->filename("PSPHOT.PSF.SKY.SAVE", $outroot);
@@ -142 +142 @@
 foreach my $imfile (@$imfiles) {
     my $image = $imfile->{uri}; # Image name
-    my $weight = $ipprc->filename("PPIMAGE.CHIP.WEIGHT", $imfile->{chip_path_base}, $imfile->{class_id}); # Mask name
+    my $weight = $ipprc->filename("PPIMAGE.CHIP.VARIANCE", $imfile->{chip_path_base}, $imfile->{class_id}); # Mask name
 
     my $mask = $ipprc->filename("PSASTRO.OUTPUT.MASK", $imfile->{cam_path_base}, $imfile->{class_id}); # Mask name
     if (!$ipprc->file_exists($mask)) {
-        print "Celestial mask $mask not found, using basic mask\n";
-        $mask = $ipprc->filename("PPIMAGE.CHIP.MASK", $imfile->{chip_path_base}, $imfile->{class_id}); # Mask name
-        &my_die("Couldn't find input file: $mask", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($mask);
+        print "Celestial mask $mask not found, using basic mask\n";
+        $mask = $ipprc->filename("PPIMAGE.CHIP.MASK", $imfile->{chip_path_base}, $imfile->{class_id}); # Mask name
+        &my_die("Couldn't find input file: $mask", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($mask);
     }
 
@@ -182 +182 @@
     $command .= " -list $imageName";
     $command .= " -masklist $maskName";
-    $command .= " -weightlist $weightName";
+    $command .= " -variancelist $weightName";
     $command .= " -astromlist $astromName";
     $command .= " $outroot $skyFile";