Changeset 19303

Timestamp:

Aug 31, 2008, 2:19:52 PM (18 years ago)

Author:

eugene

Message:

explicit use of PSPHOT.OUT.CMF.MEF

Location:

trunk/ippScripts/scripts

Files:

• diff_skycell.pl (modified) (5 diffs)
• stack_skycell.pl (modified) (1 diff)

trunk/ippScripts/scripts/diff_skycell.pl

@@ -99 +99 @@
             $templateMask = "PPSTACK.OUTPUT.MASK";
             $templateWeight = "PPSTACK.OUTPUT.WEIGHT";
-            $templateSources = "PSPHOT.OUTPUT";
+            $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";
@@ -141 +142 @@
 $ipprc->define_camera($camera);
 
+# print "templateMask: $templateMask\n";
+# print "templatePath: $templatePath\n";
+# print "inputMask: $inputMask\n";
+# print "inputPath: $inputPath\n";
+# print "templateWeight: $templateWeight\n";
+# print "inputWeight: $inputWeight\n";
+# print "templateSources: $templateSources\n";
+
 $templateMask = $ipprc->filename($templateMask, $templatePath);
 $inputMask = $ipprc->filename($inputMask, $inputPath);
@@ -146 +155 @@
 $inputWeight = $ipprc->filename($inputWeight, $inputPath);
 $templateSources = $ipprc->filename($templateSources, $templatePath);
+
+print "templateMask: $templateMask\n";
+print "templatePath: $templatePath\n";
+print "inputMask: $inputMask\n";
+print "inputPath: $inputPath\n";
+print "templateWeight: $templateWeight\n";
+print "inputWeight: $inputWeight\n";
+print "templateSources: $templateSources\n";
 
 &my_die("Couldn't find input: $template", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($template);
@@ -159 +176 @@
 my $outputMask = $ipprc->filename("PPSUB.OUTPUT.MASK", $outroot);
 my $outputWeight = $ipprc->filename("PPSUB.OUTPUT.WEIGHT", $outroot);
-my $outputSources = $ipprc->filename("PSPHOT.OUTPUT", $outroot);
+my $outputSources = $ipprc->filename("PSPHOT.OUT.CMF.MEF", $outroot);
 #my $bin1Name =  $ipprc->filename("PPSUB.BIN1", $outroot);
 #my $bin2Name =  $ipprc->filename("PPSUB.BIN2", $outroot);
@@ -175 +192 @@
     $command .= " -stats $outputStats";
     $command .= " -recipe PPSTATS WARPSTATS";
+    $command .= " -F PSPHOT.OUTPUT PSPHOT.OUT.CMF.MEF";
     $command .= " -sources $templateSources";
     $command .= " -photometry";

trunk/ippScripts/scripts/stack_skycell.pl

@@ -159 +159 @@
 my $outputMask = $ipprc->filename("PPSTACK.OUTPUT.MASK", $outroot);
 my $outputWeight = $ipprc->filename("PPSTACK.OUTPUT.WEIGHT", $outroot);
-my $outputSources = $ipprc->filename("PSPHOT.OUT.CMF.MEF", $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
 #my $bin1Name =  $ipprc->filename("PPSTACK.BIN1", $outroot);
 #my $bin2Name =  $ipprc->filename("PPSTACK.BIN2", $outroot);