Changeset 34241 for branches/eam_branches/ipp-20120627/ippScripts

Timestamp:

Jul 31, 2012, 11:38:18 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/ippScripts/scripts

Files:

• destreak_restore_camera.pl (modified) (1 prop)
• ipp_apply_burntool_single.pl (modified) (1 prop)
• magic_destreak.pl (modified) (1 prop)
• nightly_science.pl (modified) (1 diff)
• skycalibration.pl (modified) (1 diff)

branches/eam_branches/ipp-20120627/ippScripts/scripts/nightly_science.pl

@@ -1006 +1006 @@
         $cmd .= " -set_reduction NIGHTLY_STACK ";
     }
+    if (defined($science_config{$target}{ADDITIONAL_STACK_LABEL})) {
+        # Grab list of skycells
+        my $skycell_select = '';
+        {
+            my %skycells = ();
+            my $warpcmd = "$warptool -warped -label $label -data_group $data_group  -dbname $dbname";
+            my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) = 
+                run(command => $warpcmd, verbose => $verbose);
+            unless($success) {
+                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                &my_die("Unabel to perform warptool -warped to determine skycell_ids: $error_code",$target);
+            }
+            my $runs = $mdcParser->parse_list(join "", @$stdout_buf) or
+                &my_die("Unabel to parse warptool -warped to determine skycell_ids: $error_code",$target);
+            if ($#{ $runs } != -1) {
+                for my $warp (@$runs) {
+                    $skycells{$warp->{skycell_id}} = 1;
+                }
+                foreach my $skycell (sort (keys (%skycells))) {
+                    $skycell_select .= " -skycell $skycell ";
+                }
+                $cmd .= " -select_label $science_config{$target}{ADDITIONAL_STACK_LABEL} $skycell_select ";
+            }
+        }
+    }
     $cmd .= " $select ";
     if ($debug == 1) {

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

@@ -134 +134 @@
 my $file;
 if (!$singlefilter) {
-    $file = $ipprc->filename('PSPHOT.STACK.OUTPUT', "$path_base.stk", $stack_id);
+    $file = $ipprc->filename('PSPHOT.STACK.OUTPUT', $path_base, $stack_id);
     if (! $ipprc->file_resolve($file)) {
         # XXX: Beginning of section that can be removed eventually