Changeset 29515 for branches/eam_branches/ipp-20100823/pstamp/scripts/detect_query_read

Timestamp:

Oct 21, 2010, 2:45:13 PM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20100823/pstamp/scripts/detect_query_read (modified) (7 diffs)

branches/eam_branches/ipp-20100823/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");
 
 
@@ -164 +165 @@
     }
     elsif ($status == 219) {
-        @{ $colData{$col->{name}} } = map { "Not Set" } (0 .. $numRows - 1);
+        @{ $colData{$col->{name}} } = map { "Not_Set" } (0 .. $numRows - 1);
         $status = 0;
     }
@@ -173 +174 @@
 # Simple stuff first.
     my %known_filters = ();
-    if ($colData{STAGE}[$i] eq "Not Set") {
+    if ($colData{STAGE}[$i] eq "Not_Set") {
         $colData{STAGE}[$i] = 'diff';
     }
-    if ($colData{OBSCODE}[$i] eq "Not Set") {
+    if ($colData{OBSCODE}[$i] eq "Not_Set") {
         $colData{OBSCODE}[$i] = 566;
     }
 # Define filter and MJD from FPA_ID
-    if (($colData{FILTER}[$i] eq "Not Set")&&($colData{FPA_ID}[$i] ne "Not Set")) {
+    if (($colData{FILTER}[$i] eq "Not_Set")&&($colData{FPA_ID}[$i] ne "Not_Set")) {
         if (exists($known_filters{$colData{FPA_ID}[$i]})) {
             $colData{FILTER}[$i] = $known_filters{$colData{FPA_ID}[$i]};
@@ -210 +211 @@
         }
     }
-    if (($colData{'MJD-OBS'}[$i] eq "Not Set")&&($colData{FPA_ID}[$i] ne "Not Set")) {
+    # Calculate a MJD
+    if (($colData{'MJD-OBS'}[$i] eq "Not_Set")&&($colData{FPA_ID}[$i] ne "Not_Set")) {
         # HACK!
         my $mjd = $colData{FPA_ID}[$i];
@@ -217 +219 @@
         $colData{'MJD-OBS'}[$i] = $mjd;
     }
-    if (($colData{FPA_ID}[$i] eq "Not Set")&&(($colData{'FILTER'}[$i] ne "Not Set")&&
-                                              ($colData{'MJD-OBS'}[$i] ne "Not Set"))) {
+    # 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"))) {
         my $dateobs_begin = mjd_to_dateobs($colData{'MJD-OBS'}[$i]);
         my $dateobs_end = mjd_to_dateobs($colData{'MJD-OBS'}[$i] + 1);
@@ -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';
     }
 }