Changeset 34735 for branches/eam_branches/ipp-20120905/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

Timestamp:

Nov 29, 2012, 2:15:01 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (4 diffs)

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

@@ -304 +304 @@
         $skycell_id = $component;
         $command = "$stacktool -sumskyfile -dbname $imagedb";
+        # only consider stacks in full state.
+        $command .= " -state full";
         $id_opt = "-stack_id";
         $component_args = " -skycell_id $skycell_id" if $skycell_id and $skycell_id ne  'all';
@@ -894 +896 @@
         } else {
             # skip these obsolete tesselations unless they were explicitly asked for
-            # should I do this?
             next if $tess_id eq "FIXNS";
             next if $tess_id eq "ALLSKY";
+            next if $tess_id eq "RINGS.V0";
         }
         next if $requested_skycell and ($skycell_id ne $requested_skycell);
@@ -1287 +1289 @@
 
     my $id_name = $stage . "_id";
+    $id_name = 'exp_id' if $stage eq 'raw';
 
     # input list is "order by exp_id, run_id DESC"   run_id is one of (chip_id, warp_id, diff_id)
@@ -1307 +1310 @@
         my $magicked = $input->{magicked};  # this will be either stageRun.magicked or stage%file.magicked
         my $state = $input->{state};
+        $state = $input->{data_state} if !defined $state;
 
         # can't process run in these states