Changeset 34716

Timestamp:

Nov 27, 2012, 11:52:42 AM (14 years ago)

Author:

bills

Message:

better handling of the fact that we currently do not update RINGS.V0 warps

Location:

trunk

Files:

• PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (3 diffs)
• pstamp/scripts/pstamp_checkdependent.pl (modified) (1 diff)

trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -896 +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);
@@ -1289 +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)
@@ -1309 +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

trunk/pstamp/scripts/pstamp_checkdependent.pl

@@ -343 +343 @@
     }
 }
+
+    my $tess_id = $metadata->{tess_id};
+    if ($tess_id eq 'RINGS.V0') {
+        # we have stopped updating data from RINGS.V0
+        return $PSTAMP_GONE
+    }
     if (($state =~ /error/) or ($state =~ /purged/) or ($state =~ /scrubbed/) or ($state eq 'drop') or
          ($data_state =~ /error/) or ($data_state =~ /purged/) or ($data_state =~ /scrubbed/) or ($data_state eq 'drop')) {