Changeset 34747 for branches/eam_branches/ipp-20120905/ippScripts

Timestamp:

Nov 30, 2012, 9:57:42 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/magic_destreak.pl (modified) (1 prop)
• ippScripts/scripts/skycalibration.pl (modified) (3 diffs)
• ippScripts/scripts/staticsky.pl (modified) (2 diffs)

branches/eam_branches/ipp-20120905/ippScripts/scripts/skycalibration.pl

@@ -33 +33 @@
 my $psastro = can_run('psastro') or (warn "Can't find psastro" and $missing_tools = 1);
 my $fhead = can_run('fhead') or (warn "Can't find fhead" and $missing_tools = 1);
+my $fields = can_run('fields') or (warn "Can't find fields" and $missing_tools = 1);
 my $ppStatsFromMetadata = can_run('ppStatsFromMetadata') or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1);
 my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" and $missing_tools = 1);
@@ -191 +192 @@
 }
 
+my $resolved = $ipprc->file_resolve($file);
+if (!$resolved) {
+    &my_die("Unable to find input file: $file", $skycal_id, $PS_EXIT_SYS_ERROR);
+}
+
+# read the input header to find the number of detections and the number of detections
+# with extended model
+my $n_detections = 0;
+my $n_extended = 0;
+{
+    my $command = "echo $resolved | $fields -n SkyChip.psf NAXIS2";
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => 0);
+        # fields does not return 0 on success
+    (undef, $n_detections)  = split " ", join "", @$stdout_buf;
+    chomp $n_detections;
+    &my_die("Unable to find number of detections from $file: ", $skycal_id, $PS_EXIT_SYS_ERROR)
+        unless defined $n_detections;
+
+    $command = "echo $resolved | $fields -n SkyChip.hdr NDET_EXT";
+    ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => 0);
+    (undef, $n_extended)  = split " ", join "", @$stdout_buf;
+    chomp $n_extended;
+    &my_die("Unable to find number of extended objects from $file: ", $skycal_id, $PS_EXIT_SYS_ERROR)
+        unless defined $n_extended;
+}
+
+
 # Perform psastro analysis
 my $output_sources_filerule =  'PSASTRO.OUTPUT.CMF';
@@ -246 +276 @@
 {
     my $command = "$staticskytool -skycal_id $skycal_id";
+    $command .= " -n_detections $n_detections";
+    $command .= " -n_extended $n_extended";
     $command .= " -addskycalresult -path_base $outroot";
     $command .= " $cmdflags";

branches/eam_branches/ipp-20120905/ippScripts/scripts/staticsky.pl

@@ -124 +124 @@
 my $nInputs = @$files;
 
-if ($nInputs > 1) {
+if (1) {
         my $recipe_psphot  = $ipprc->reduction($reduction, 'STACKPHOT_PSPHOT'); # Recipe to use for psphot
         my $recipe_ppsub   = $ipprc->reduction($reduction, 'STACKPHOT_PPSUB'); # Recipe to use for ppsub
@@ -266 +266 @@
         }
 } else {
+    # XXX This mode is no longer used. We run psphotStack even if there is only one filter
         # single input. Run psphot
         # find the recipe