Changeset 36827 for branches/eam_branches/ipp-20140423/pstamp/scripts/pstamp_checkdependent.pl

Timestamp:

Jun 7, 2014, 5:37:10 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20140423/pstamp/scripts/pstamp_checkdependent.pl (modified) (4 diffs, 1 prop)

branches/eam_branches/ipp-20140423/pstamp/scripts/pstamp_checkdependent.pl

@@ -21 +21 @@
 use Carp;
 
-my $disable_3PI_updates = 1;
+my $disable_3PI_updates = 0;
+my $ra_max_3PI_hours = 22.5;  # disable updates for skycells with ra greater than this (hours)
+my $ra_max_3PI = $ra_max_3PI_hours * 15 * 3.14149 / 180.; # rawExp.ra is in radians
 
 # XXX: put this in a module somewhere
@@ -260 +262 @@
 
         if ($disable_3PI_updates && ($chip->{data_group} =~ /ThreePi/)) {
-            # we are getting close to the end of PV2. Do not update PV1 chips.
-            print "3PI updates are currently disabled\n";
-            return $PSTAMP_NOT_AVAILABLE;
+            # we are getting close to the end of PV2. Do not update PV1 chips if RA is above the limit.
+            my $ra = $chip->{ra};
+            if (!defined($ra) or ($ra > $ra_max_3PI)) {
+                print "3PI updates are currently disabled for RA $ra > $ra_max_3PI (radians)\n";
+                return $PSTAMP_NOT_AVAILABLE;
+            } else {
+                print "allowing 3PI updates RA $ra\n";
+            }
         } 
 
@@ -381 +388 @@
     # we are getting close to the end of PV2. optionally do not update 3Pi data.
     if ($disable_3PI_updates && ($metadata->{data_group} =~ /ThreePi/)) {
-        print "3PI updates are currently disabled\n";
-        return $PSTAMP_NOT_AVAILABLE;
+        my $ra = $metadata->{ra};
+        if (!defined $ra or ($ra > $ra_max_3PI)) {
+            print "3PI updates are currently disabled for RA $ra > $ra_max_3PI (radians)\n";
+            return $PSTAMP_NOT_AVAILABLE;
+        } else {
+            print "allowing 3PI updates RA $ra\n";
+        }
     } 
 
@@ -465 +477 @@
         }
         $chip_id = $chip->{chip_id};
+        # XXX: -scmap doesn't have ra and dec. Copy it from the warp
+        $chip->{ra} = $metadata->{ra};
+        $chip->{decl} = $metadata->{decl};
 
         # if chip has been magicked before require it to be magicked again