Changeset 29088

Timestamp:

Aug 31, 2010, 10:18:00 PM (16 years ago)

Author:

watersc1

Message:

backport of bad request bug fix.

File:

• tags/ipp-20100823/pstamp/scripts/detectability_respond.pl (modified) (5 diffs)

tags/ipp-20100823/pstamp/scripts/detectability_respond.pl

@@ -204 +204 @@
             $rowList[$i]->{ID} = $query{$fpa_id}{ROWNUM}[$i];
             $rowList[$i]->{COORD_MASK} = 0;
+            # Set default values
+            $query{$fpa_id}{BAD_COMPONENT}[$i] = 1;
+            $query{$fpa_id}{IMAGE}[$i] = 'no_image';
+            $query{$fpa_id}{MASK}[$i] = 'no_mask';
+            $query{$fpa_id}{WEIGHT}[$i] = 'no_weight';
+            $query{$fpa_id}{PSF}[$i] = 'no_psf';
+
+            $query{$fpa_id}{STAGE_ID}[$i] = 'no_id';
+            $query{$fpa_id}{IMAGE_DB}[$i] = 'no_imdb';
+            $query{$fpa_id}{NEED_MAGIC}[$i] = 'no_magic';
+            $query{$fpa_id}{MAGICKED}[$i] = 'no_magic';
+            $query{$fpa_id}{CATALOG}[$i] = 'no_catalog';
+            $query{$fpa_id}{COMPONENT_ID}[$i] = 'no_component';
+            $query{$fpa_id}{CLASS_ID}[$i] = 'no_class';
+
+            $query{$fpa_id}{STATE}[$i] = 'no_state';
+            $query{$fpa_id}{DATA_STATE}[$i] = 'no_dstate';
+            $query{$fpa_id}{FAULT}[$i] = 'no_fault';
+            $query{$fpa_id}{BURNTOOL_STATE}[$i] = 'no_btstate';
+
         }
         
@@ -221 +241 @@
                     $value = join ' ', @{ $this_image_ref->{$key} };
                 }
+
 #               print "$this_image_ref $key $value\n";
                 foreach my $valid_index (@{ $this_image_ref->{row_index} }) {
@@ -230 +251 @@
                     $query{$fpa_id}{IMAGE_DB}[$valid_index] = $this_image_ref->{imagedb};
                     $query{$fpa_id}{NEED_MAGIC}[$valid_index] = $need_magic;
+                    $query{$fpa_id}{BAD_COMPONENT}[$valid_index] = 0;
                     
                     if (exists($this_image_ref->{astrom})) {
@@ -305 +327 @@
         }
         print WISDOM "\n";
-        @{ $update_request{$query{$fpa_id}{IMAGE}[$i]}{$query{$fpa_id}{FAULT}[$i]} } = 
-            ($query{$fpa_id}{STATE}[$i],$query{$fpa_id}{STAGE}[$i],$query{$fpa_id}{STAGE_ID}[$i],
-             $query{$fpa_id}{COMPONENT_ID}[$i],$query{$fpa_id}{NEED_MAGIC}[$i],$query{$fpa_id}{IMAGE_DB}[$i]);
-        push @{ $processing_request{$fpa_id}{$query{$fpa_id}{IMAGE}[$i]} }, $i;
+        if ($query{$fpa_id}{BAD_COMPONENT}[$i] == 0) {
+            @{ $update_request{$query{$fpa_id}{IMAGE}[$i]}{$query{$fpa_id}{FAULT}[$i]} } = 
+                ($query{$fpa_id}{STATE}[$i],$query{$fpa_id}{STAGE}[$i],$query{$fpa_id}{STAGE_ID}[$i],
+                 $query{$fpa_id}{COMPONENT_ID}[$i],$query{$fpa_id}{NEED_MAGIC}[$i],$query{$fpa_id}{IMAGE_DB}[$i]);
+            push @{ $processing_request{$fpa_id}{$query{$fpa_id}{IMAGE}[$i]} }, $i;
+        }
     }
 }
@@ -360 +384 @@
         my $stage = $query{$fpa_id}{STAGE}[$index];
         # if there's a fault, then we can't process this image.
-        if ($fault != 0) {
+        if (($fault != 0)||($query{$fpa_id}{BAD_COMPONENT}[$index] == 1)) {
+            $query{$fpa_id}{PROC_ERROR}[$index] = 23;
+            
+            $query{$fpa_id}{NPIX}[$index] = 0;
+            $query{$fpa_id}{QFACTOR}[$index] = 0.0;
+            $query{$fpa_id}{FLUX}[$index] = 0.0;
+            $query{$fpa_id}{FLUX_SIG}[$index] = 0.0;
+
             next;
         }