Changeset 34242

Timestamp:

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

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627

Files:

• PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (6 diffs)
• ippTasks/pantasks.pro (modified) (1 diff)
• ippTasks/science.cleanup.pro (modified) (5 diffs)
• ppImage/src (modified) (1 prop)

branches/eam_branches/ipp-20120627/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -48 +48 @@
 my ($regtool, $chiptool, $camtool, $warptool, $stacktool, $difftool);
 my ($pstamptool, $dvoImagesAtCoords, $whichimage, $ppConfigDump);
+
+my $default_data_groups = "";
 
 sub locate_images {
@@ -76 +78 @@
            ($req_type ne "byskycell");
 
+    $default_data_groups = load_data_groups($verbose);
 
     my $dateobs_begin;
@@ -342 +345 @@
         die "tess_id and component are required for byskycell" if !$tess_id or ! $skycell_id;
         $command .= " -tess_id $tess_id -skycell_id $skycell_id";
+        if ($stage ne 'stack') {
+            $filter_runs = 1;
+        }
     } else {
         # this should be caught by caller
@@ -357 +363 @@
 
     $command .= " -filter $filter" if !isnull($filter);
-    $command .= " -data_group $data_group" if !isnull($data_group);
+
+    if (!isnull($data_group)) {
+        $command .= " -data_group $data_group";
+    } elsif ($req_type eq 'byskycell') {
+        $command .= $default_data_groups;
+    }
 
     my $images = runToolAndParse($command, $verbose);
@@ -727 +738 @@
            # always the case. If this turns out to be a problem we can defer
            # the data_group test to when we look up the chipProcessedImfiles
-           $command .= " -data_group $data_group" if $data_group;
+           if ($data_group) {
+               $command .= " -data_group $data_group";
+           } else {
+               $command .= $default_data_groups;
+           }
            $command .= " -destreaked" if $need_magic;
 
@@ -1409 +1424 @@
 }
 
+sub load_data_groups {
+    my $verbose = shift;
+    my $command = "$ppConfigDump -dump-recipe PSTAMP -";
+
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => $verbose);
+    unless ($success) {
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        die("Unable to perform ppConfigDump: $error_code");
+    }
+    my $mdcParser = PS::IPP::Metadata::Config->new;
+    my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
+        die ("Unable to parse metadata config doc");
+
+    my $data_group_string = "";
+    foreach my $item (@$metadata) {
+        my $tag = $item->{name};
+        next if $tag ne "DATA_GROUP";
+        my $dg = $item->{value};
+#        print "adding $dg to list of default data groups\n";
+        $data_group_string .= " -data_group $dg";
+    }
+    return $data_group_string;
+}
+
 sub my_die
 {

branches/eam_branches/ipp-20120627/ippTasks/pantasks.pro

@@ -506 +506 @@
 end
 
+macro set.keep.failures
+  if ($0 != 2)
+    echo "USAGE:set.keep.failures (value)"
+    break
+  end
+
+  $KEEP_FAILURES = $1
+end
+
+macro get.keep.failures
+  echo "KEEP_FAILURES: $KEEP_FAILURES"
+end
+
+
+
+
 macro set.verbosity
   if ($0 != 2)

branches/eam_branches/ipp-20120627/ippTasks/science.cleanup.pro

@@ -114 +114 @@
 
   task.exec
-    periods -exec $RUNEXEC
 
     book npages chipPendingCleanup -var N
-    if ($N == 0) break
+    if ($N == 0)
+        periods -exec $RUNEXEC
+        break
+    end
     if ($NETWORK == 0) break
     
@@ -573 +575 @@
 
   task.exec
-    periods -exec $RUNEXEC
 
     book npages warpPendingCleanup -var N
-    if ($N == 0) break
+    if ($N == 0) 
+        periods -exec $RUNEXEC
+        break
+    end
     if ($NETWORK == 0) break
     
@@ -728 +732 @@
 
   task.exec
-    periods -exec $RUNEXEC
 
     book npages diffCleanup -var N
-    if ($N == 0) break
+    if ($N == 0)
+        periods -exec $RUNEXEC
+        break
+    end
     if ($NETWORK == 0) break
     
@@ -1028 +1034 @@
 
   task.exec
-    periods -exec $RUNEXEC
 
     book npages chipBGPendingCleanup -var N
-    if ($N == 0) break
+    if ($N == 0)
+        periods -exec $RUNEXEC
+        break
+    end
     if ($NETWORK == 0) break
     
@@ -1181 +1189 @@
 
   task.exec
-    periods -exec $RUNEXEC
-
     book npages warpBGPendingCleanup -var N
-    if ($N == 0) break
+    if ($N == 0)
+        periods -exec $RUNEXEC
+        break
+    end
     if ($NETWORK == 0) break