Changeset 29157

Timestamp:

Sep 14, 2010, 12:01:03 PM (16 years ago)

Author:

watersc1

Message:

ROWNUM is defined to be a char(20) in the spec

Location:

trunk/pstamp/scripts

Files:

• detect_query_read (modified) (5 diffs)
• detectability_respond.pl (modified) (1 diff)

trunk/pstamp/scripts/detect_query_read

@@ -36 +36 @@
 
 my $regtool = can_run('regtool') or (die "Can't find regtool");
-my $camtool = can_run('camtool') or (die "Can't find regtool");
+my $camtool = can_run('camtool') or (die "Can't find camtool");
+my $difftool = can_run('difftool') or (die "Can't find difftool");
 
 
@@ -210 +211 @@
         }
     }
+    # Calculate a MJD
     if (($colData{'MJD-OBS'}[$i] eq "Not_Set")&&($colData{FPA_ID}[$i] ne "Not_Set")) {
         # HACK!
@@ -217 +219 @@
         $colData{'MJD-OBS'}[$i] = $mjd;
     }
+    # Calculate an exp_id
     if (($colData{FPA_ID}[$i] eq "Not_Set")&&(($colData{'FILTER'}[$i] ne "Not_Set")&&
                                               ($colData{'MJD-OBS'}[$i] ne "Not_Set"))) {
@@ -224 +227 @@
         my $dec = $colData{'DEC1_DEG'}[$i];
         my $filter = $colData{'FILTER'}[$i] . ".00000";
-        my $cmd = "$camtool -processedexp -dbname $dbname -filter $filter ";
-        $cmd .= " -dateobs_begin $dateobs_begin -dateobs_end $dateobs_end ";
-        $cmd .= " -ra $ra -decl $dec -radius 1.5 -limit 1";
+        my $cmd;
+        if ($colData{STAGE}[$i] eq 'SSdiff') {
+            $cmd = "$difftool -listrun -dbname $dbname -filter $filter ";
+            $cmd .= " -dateobs_begin $dateobs_begin -dateobs_end $dateobs_end ";
+            $cmd .= " -ra $ra -decl $dec -radius 1.5 -limit 1 -diff_mode 4";
+        }
+        elsif ($colData{STAGE}[$i] eq 'WSdiff') {
+            $cmd = "$difftool -listrun -dbname $dbname -filter $filter ";
+            $cmd .= " -dateobs_begin $dateobs_begin -dateobs_end $dateobs_end ";
+            $cmd .= " -ra $ra -decl $dec -radius 1.5 -limit 1 -diff_mode 2";
+        }
+        elsif ($colData{STAGE}[$i] eq 'diff') {
+            $cmd = "$difftool -listrun -dbname $dbname -filter $filter ";
+            $cmd .= " -dateobs_begin $dateobs_begin -dateobs_end $dateobs_end ";
+            $cmd .= " -ra $ra -decl $dec -radius 1.5 -limit 1";
+        }
+        else {
+            $cmd = "$camtool -processedexp -dbname $dbname -filter $filter ";
+            $cmd .= " -dateobs_begin $dateobs_begin -dateobs_end $dateobs_end ";
+            $cmd .= " -ra $ra -decl $dec -radius 1.5 -limit 1";
+        }
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $cmd, verbose => 0);
+            run(command => $cmd, verbose => 1);
         unless ($success) {
             # This is a problem, because I'm not sure how we handle a failure to read something.
@@ -243 +264 @@
             my ($key,$type,$value) = @line;
 #               print "$entry => $key / $type / $value \n";
-            if ($key =~ /exp_name/i) {
-                $colData{FPA_ID}[$i] = $value;
-            }
-        }
+            if ($colData{STAGE}[$i] =~ /diff/) {
+                if ($key =~ /diff_id/i) {
+                    $colData{FPA_ID}[$i] = $value;
+                }
+            }
+            else {
+                if ($key =~ /exp_name/i) {
+                    $colData{FPA_ID}[$i] = $value;
+                }
+            }
+        }
+    }
+    # Correct diff modes
+    if ($colData{STAGE}[$i] eq 'WSdiff') {
+        $colData{STAGE}[$i] = 'diff';
+    }
+    elsif ($colData{STAGE}[$i] eq 'SSdiff') {
+        $colData{STAGE}[$i] = 'diff';
     }
 }

trunk/pstamp/scripts/detectability_respond.pl

@@ -644 +644 @@
         $columns = [
             # matching rownum from detectability original request
-            { name => 'ROWNUM',   type => 'V', writetype => TULONG }, 
+            { name => 'ROWNUM',   type => '20A', writetype => TULONG }, 
             # any errors that occurred during processing
             { name => 'ERROR_CODE',   type => 'V', writetype => TULONG },