Changeset 25194

Timestamp:

Aug 25, 2009, 3:22:24 PM (17 years ago)

Author:

bills

Message:

temporarily allow requests for mops to skip the magic check.
Fix duplicate error status from jobs that need images that aren't destreaked
change some comments

File:

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

trunk/pstamp/scripts/pstampparse.pl

@@ -219 +219 @@
     $need_magic = $proj_hash->{need_magic};
 
+    # Temporary hack so that MOPS can get at non-magicked data
+    if ($product eq "mops-pstamp-results") {
+        $need_magic = 0;
+    }
+
     # collect rows with the same images of interest in a list so that they
     # can be looked up together
@@ -289 +294 @@
     my $have_skycells = shift;
     my $need_magic = shift;
+
     my $num_jobs = 0;
-
     my $rownum = $row->{ROWNUM};
-
     my $components = $row->{components};
 
@@ -334 +338 @@
         if (($stage ne "stack") and ($need_magic and !$image->{magicked})) {
             # XXX: should we add a faulted job so the client can know what happened if no images come back?
-            print STDERR "skippping non-magicked image $imagefile\n" if $verbose;
+            print STDERR "skipping non-magicked image $imagefile\n" if $verbose;
 
             # for now assume yes.
 
             insertFakeJobForRow($row, $job_num, $PSTAMP_NOT_DESTREAKED);
+            $num_jobs++;
 
             next;
@@ -488 +493 @@
             if ($npoints) {
                 # we collected a set of sky coordintates above filter the images so that only
-                # those tat contain the centers are processed
+                # those that contain the centers are processed
                 my $command = "$dvoImagesAtCoords $pointsListName";
                 if ($have_skycells) {
@@ -519 +524 @@
                     my ($rownum, undef, undef, $component) = split " ", $line;
 
-                    # I guess since we need this function we should be useing a hash for rowList 
+                    # I guess since we need this function we should be using a hash for rowList 
                     my $row = findRow($rownum, $rowList);
                     $row->{components}->{$component} = 1;