Changeset 21395

Timestamp:

Feb 6, 2009, 2:12:14 PM (17 years ago)

Author:

Paul Price

Message:

Correcting "weight" --> "variance".

File:

• trunk/ippScripts/scripts/diff_skycell.pl (modified) (8 diffs)

trunk/ippScripts/scripts/diff_skycell.pl

@@ -93 +93 @@
 
 # Identify the input and the template
-my ($input, $inputMask, $inputWeight, $inputPath); # Input files and path
-my ($template, $templateMask, $templateWeight, $templatePath, $templateSources); # Template files and path
+my ($input, $inputMask, $inputVariance, $inputPath); # Input files and path
+my ($template, $templateMask, $templateVariance, $templatePath, $templateSources); # Template files and path
 my $tess_id;                    # Tesselation identifier
 my $camera;                     # Camera
@@ -103 +103 @@
         if ($file->{warp_id} == 0) {
             $templateMask = "PPSTACK.OUTPUT.MASK";
-            $templateWeight = "PPSTACK.OUTPUT.VARIANCE";
+            $templateVariance = "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.VARIANCE";
+            $templateVariance = "PSWARP.OUTPUT.VARIANCE";
             $templateSources = "PSWARP.OUTPUT.SOURCES";
         }
@@ -116 +116 @@
         if ($file->{warp_id} == 0) {
             $inputMask = "PPSTACK.OUTPUT.MASK";
-            $inputWeight = "PPSTACK.OUTPUT.VARIANCE";
+            $inputVariance = "PPSTACK.OUTPUT.VARIANCE";
         } else {
             $inputMask = "PSWARP.OUTPUT.MASK";
-            $inputWeight = "PSWARP.OUTPUT.VARIANCE";
+            $inputVariance = "PSWARP.OUTPUT.VARIANCE";
         }
     }
@@ -159 +159 @@
 # print "inputMask: $inputMask\n";
 # print "inputPath: $inputPath\n";
-# print "templateWeight: $templateWeight\n";
-# print "inputWeight: $inputWeight\n";
+# print "templateVariance: $templateVariance\n";
+# print "inputVariance: $inputVariance\n";
 # print "templateSources: $templateSources\n";
 
 $templateMask = $ipprc->filename($templateMask, $templatePath);
 $inputMask = $ipprc->filename($inputMask, $inputPath);
-$templateWeight = $ipprc->filename($templateWeight, $templatePath);
-$inputWeight = $ipprc->filename($inputWeight, $inputPath);
+$templateVariance = $ipprc->filename($templateVariance, $templatePath);
+$inputVariance = $ipprc->filename($inputVariance, $inputPath);
 $templateSources = $ipprc->filename($templateSources, $templatePath);
 
@@ -173 +173 @@
 print "inputMask: $inputMask\n";
 print "inputPath: $inputPath\n";
-print "templateWeight: $templateWeight\n";
-print "inputWeight: $inputWeight\n";
+print "templateVariance: $templateVariance\n";
+print "inputVariance: $inputVariance\n";
 print "templateSources: $templateSources\n";
 
 &my_die("Couldn't find input: $template", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($template);
 &my_die("Couldn't find input: $templateMask", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateMask);
-&my_die("Couldn't find input: $templateWeight", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateWeight);
+&my_die("Couldn't find input: $templateVariance", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateVariance);
 &my_die("Couldn't find input: $input", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input);
 &my_die("Couldn't find input: $inputMask", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputMask);
-&my_die("Couldn't find input: $inputWeight", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputWeight);
+&my_die("Couldn't find input: $inputVariance", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputVariance);
 &my_die("Couldn't find input: $templateSources", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateSources);
 
@@ -188 +188 @@
 my $outputName = $ipprc->filename("PPSUB.OUTPUT", $outroot);
 my $outputMask = $ipprc->filename("PPSUB.OUTPUT.MASK", $outroot);
-my $outputWeight = $ipprc->filename("PPSUB.OUTPUT.VARIANCE", $outroot);
+my $outputVariance = $ipprc->filename("PPSUB.OUTPUT.VARIANCE", $outroot);
 my $configuration = $ipprc->filename("PPSUB.CONFIG", $outroot);
 my $outputSources = $ipprc->filename("PSPHOT.OUT.CMF.MEF", $outroot);
@@ -203 +203 @@
     $command .= " -inmask $inputMask";
     $command .= " -refmask $templateMask";
-    $command .= " -inweight $inputWeight";
-    $command .= " -refweight $templateWeight";
+    $command .= " -invariance $inputVariance";
+    $command .= " -refvariance $templateVariance";
     $command .= " -stats $outputStats";
     $command .= " -threads $threads" if defined $threads;
@@ -227 +227 @@
     &my_die("Couldn't find expected output file: $outputName", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName);
     &my_die("Couldn't find expected output file: $outputMask", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
-    &my_die("Couldn't find expected output file: $outputWeight", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight);
+    &my_die("Couldn't find expected output file: $outputVariance", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputVariance);
 #    &my_die("Couldn't find expected output file: $outputSources", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
 #    &my_die("Couldn't find expected output file: $bin1Name",    $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name);