Changeset 27788

Timestamp:

Apr 27, 2010, 4:08:17 PM (16 years ago)

Author:

watersc1

Message:

Merged changes from my branch to support STAGE in the query header, and updated the response script to use the new API. It is not at all efficient at finding the images, but it is satisfactory for now. I can refactro it a bit once the glue sticking it to the rest of the Pstamp server is fininshed.

Location:

trunk/pstamp

Files:

• scripts/detect_query_read (modified) (2 diffs)
• scripts/detectability_respond.pl (modified) (7 diffs)
• test/detect_query_create (modified) (3 diffs)

trunk/pstamp/scripts/detect_query_read

@@ -78 +78 @@
                         comment => 'site identifier (MPC observatory code)',
                         value => undef
-              }
+                      },
+        'STAGE'    => { 
+                        name => 'STAGE',
+                        writetype => TSTRING,
+                        comment => 'processing stage to examine',
+                        value => undef
+                      }
 };
 
 # key_array insures that the order that the keywords is printed out is
 # the same as the ICD
-my @key_array = qw( QUERY_ID FPA_ID MJD_OBS FILTER OBSCODE );
+my @key_array = qw( QUERY_ID FPA_ID MJD_OBS FILTER OBSCODE STAGE);
 
 # Specification of columns
@@ -144 +150 @@
         my $name = $header->{$key}->{name};
         my $value = $inHeader->{$name};
+        if (($key eq 'STAGE')&& !(defined($value))) {
+            $value = 'DIFF';
+        }
         # get rid of quotes and whitespace
         $value =~ s/\'//g;

trunk/pstamp/scripts/detectability_respond.pl

@@ -73 +73 @@
 #my $tmp_dir = "/data/${host}.0/tmp/";
 
+my $project = resolve_project($ipprc,"project_name",$dbname);
 #
 # Parse input request file using detect_query_read (as it's already written).
@@ -120 +121 @@
 for (my $i = 1; $i < $Nrows; $i++) {
 #    print "$i $Nrows $query{CONTENT}{RA1_DEG}[$i] $query{CONTENT}{DEC1_DEG}[$i]\n";
-
     my $image_set_tmp  = find_image_set($query{HEADER}{FPA_ID}[0],$query{HEADER}{STAGE}[0],
                                         $query{HEADER}{MJD_OBS}[0],$query{HEADER}{FILTER}[0],
@@ -143 +143 @@
 my $i = 0;
 
+
 foreach my $k (keys %image_list_hash) {
     # Write coordinates of the requested targets to a file.
@@ -153 +154 @@
         print $coordfile "$image_list_hash{$k}{SKY_COORDINATES}[$j]\n";
     }
-
+    print "$k\n";
     # Convert the sky coordinates to image coordinates with ppCoord.
     my $command = "ppCoord -astrom $image_list_hash{$k}{CATALOG} -radec $coordname";
@@ -171 +172 @@
     }
 
-    
+    print "psphot $image_list_hash{$k}{PSF}\n";
     # Run psphotForced on the target list.
     my $tmpdir  = tempdir("detect.$i.XXXX", DIR => "/tmp/", CLEANUP => !$save_temps);
@@ -215 +216 @@
                     $query{HEADER}{obscode}[0],
                     \@rownums, \@psphot_Npix, \@psphot_Qfact, \@psphot_flux);
-
+print "Wrote response file $output\n";
 #
 # Add to datastore
@@ -252 +253 @@
     my $mjd_max = $mjd + 1;
 
+    # Construct a row list:
+
+    my @rowList;
+    $rowList[0]->{CENTER_X} = $ra;
+    $rowList[0]->{CENTER_Y} = $dec;
+    $rowList[0]->{ID} = 1;
+    $rowList[0]->{STAGE} = $stage;
+    $rowList[0]->{COORD_MASK} = 0;
+    print "$stage\n";
     # Call the PStamp code to find the images that contain the target on the given MJD in the specified filter.
-    my @images = locate_images($ipprc,$dbname,"bycoord",$stage,
-                               undef,undef,undef,$option_mask,$need_magic,
-                               $ra,$dec,$mjd_min,$mjd_max,$filter . ".00000",undef,$verbose);  
+    my @images = locate_images($ipprc,$dbname,
+                                \@rowList,
+                               "bycoord",$stage,
+                               undef,undef,undef,
+                               $option_mask,$need_magic,
+                               # $ra,$dec,
+                               $mjd_min,$mjd_max,$filter . ".00000",undef,$verbose);  
 
     my %image_info  = ();

trunk/pstamp/test/detect_query_create

@@ -16 +16 @@
      $output,                   # Name of output table
      $query_id, 
+     $nostage,
      );
 
@@ -22 +23 @@
            'output|o=s'   => \$output,
            'query_id|q=s'  => \$query_id,
+           'nostage'      => \$nostage,
 ) or pod2usage( 2 );
 
@@ -61 +63 @@
         }
 ];
+unless(defined($nostage)) {
+    push @{ $header },        { name =>  'STAGE',
+                                writetype => TSTRING,
+                                comment => 'processing stage to examine',
+                                value => undef
+    };
+}
 
 # Specification of columns to write