Changeset 26289 for trunk/pstamp/scripts/pstampparse.pl

Timestamp:

Nov 29, 2009, 3:17:29 PM (17 years ago)

Author:

bills

Message:

various changes to the postage stamp server.

File:

• trunk/pstamp/scripts/pstampparse.pl (modified) (8 diffs)

trunk/pstamp/scripts/pstampparse.pl

@@ -193 +193 @@
     my $mjd_min = $row->{MJD_MIN};
     my $mjd_max = $row->{MJD_MAX};
-    my $label   = $row->{LABEL};
+    my $data_group = $row->{DATA_GROUP};
+    if (!defined $data_group) {
+        # backwards compatability hook
+        $data_group = $row->{LABEL};
+    }
+        
     my $x       = $row->{CENTER_X};
     my $y       = $row->{CENTER_Y};
@@ -272 +277 @@
     # request specification. An array reference is returned.
     $imageList = locate_images($ipprc, $image_db, $req_type, $stage, $id, $tess_id, $search_component,
-                $inverse, $need_magic, $x, $y, $mjd_min, $mjd_max, $filter, $label, $verbose);
+                $inverse, $need_magic, $x, $y, $mjd_min, $mjd_max, $filter, $data_group, $verbose);
 
     if (!$imageList or !@$imageList) {
@@ -424 +429 @@
                     # set up to queue an update run
                     queue_update_run(\$newState, \$fault, \$dep_id, $image->{image_db}, 
-                        $run_state, $stage, $image->{stage_id}, $need_magic, $image->{label});
+                        $run_state, $stage, $image->{stage_id}, $need_magic);
                 }
             }
@@ -548 +553 @@
                 # we collected a set of sky coordinates above.
                 # filter the images so that only those that contain the centers of the ROIs are processed
-                my $command = "$dvoImagesAtCoords $pointsListName";
+                my $command = "$dvoImagesAtCoords -coords $pointsListName";
                 if ($have_skycells) {
                     my $tess_id = $thisRun->[0]->{tess_id};
@@ -671 +676 @@
                     # set up to queue an update run
                     queue_update_run(\$newState, \$fault, \$dep_id, $image->{image_db}, 
-                        $run_state, $stage, $image->{stage_id}, $need_magic, $image->{label});
+                        $run_state, $stage, $image->{stage_id}, $need_magic);
                 }
             }
@@ -801 +806 @@
     return 0 if ($r1->{TESS_ID}  ne $r2->{TESS_ID});
     return 0 if ($r1->{REQFILT}  ne $r2->{REQFILT});
-    return 0 if ($r1->{LABEL}    ne $r2->{LABEL});
+    return 0 if ($r1->{DATA_GROUP}    ne $r2->{DATA_GROUP});
     return 0 if ($r1->{MJD_MIN}  ne $r2->{MJD_MAX});
     return 0 if ($r1->{MJD_MAX}  ne $r2->{MJD_MAX});
@@ -850 +855 @@
 sub queue_update_run 
 {
-    my ($r_jobState, $r_fault, $r_dep_id, $imagedb, $state, $stage, $stage_id, $need_magic, $label) = @_;
+    my ($r_jobState, $r_fault, $r_dep_id, $imagedb, $state, $stage, $stage_id, $need_magic) = @_;
 
     if (($state ne 'cleaned') and ($state ne 'update') and ($state ne 'goto_cleaned')) {
@@ -858 +863 @@
     my $dep_id;
     my $command = "$pstamptool -getdependent -stage $stage -stage_id $stage_id -imagedb $imagedb";
-    $command .= " -rlabel $label" if $label;
     $command .= " -no_magic" if !$need_magic;
     if (!$no_update) {