Changeset 41440 for trunk/pstamp/scripts/detect_query_read

Timestamp:

Nov 25, 2020, 5:26:50 PM (6 years ago)

Author:

mhuber

Message:

add PROJECT, COMPONENT_ID, TESS_ID and modifications to allow for gpc2 in dquery and add restrictions to prevent oddities

File:

• trunk/pstamp/scripts/detect_query_read (modified) (6 diffs)

trunk/pstamp/scripts/detect_query_read

@@ -83 +83 @@
 my ($EXTVER,$headerEXTNAME,$QUERY_ID,
     $FPA_ID,$MJD_OBS,$FILTER,
-    $OBSCODE,$STAGE) = 
+    $OBSCODE,$STAGE,$COMPONENT_ID,$PROJECT,$TESS_ID) = 
     ($inHeader->{EXTVER},$inHeader->{EXTNAME},$inHeader->{QUERY_ID},
      $inHeader->{FPA_ID},$inHeader->{'MJD-OBS'},$inHeader->{FILTER},
-     $inHeader->{OBSCODE},$inHeader->{STAGE});
+     $inHeader->{OBSCODE},$inHeader->{STAGE},$inHeader->{COMPONENT_ID},
+     $inHeader->{PROJECT},$inHeader->{TESS_ID});
 
 unless(defined($EXTVER) && defined($headerEXTNAME) &&
@@ -126 +127 @@
     # v2 stage: stage name to perform query on, allowed values of 'chip', 'warp', 'stack', and 'diff'
     { name => 'STAGE', type => '20A', writetype => TSTRING, version => 2, default => $STAGE },
+    #
+    { name => 'COMPONENT_ID', type => '20A', writetype => TSTRING, version => 2, default => $COMPONENT_ID },
+    #
+    { name => 'PROJECT', type => '16A', writetype => TSTRING, version => 2, default => $PROJECT },    
+    #
+    { name => 'TESS_ID', type => '64A', writetype => TSTRING, version => 2, default => $TESS_ID },
 ];
 
@@ -203 +210 @@
                 my ($key,$type,$value) = @line;
 #               print "$entry => $key / $type / $value \n";
+                # if gpc2 then needs .00002
                 if ($key =~ /filter/i) {
                     $value =~ s/.00000//;
@@ -215 +223 @@
         # HACK!
         my $mjd = $colData{FPA_ID}[$i];
+        # need to remove g for gpc2
         $mjd =~ s/o(....)g.*/$1/;
         $mjd += 50000;
@@ -227 +236 @@
         my $ra = $colData{'RA1_DEG'}[$i];
         my $dec = $colData{'DEC1_DEG'}[$i];
+        # if gpc2 then .00002
         my $filter = $colData{'FILTER'}[$i] . ".00000";
         my $cmd;
@@ -294 +304 @@
 
 # Verify uniqueness of important columns:
+# -- need to add PROJECT as well?
 my @unique_fields = ('QUERY_ID','OBSCODE','STAGE');
 foreach my $colName (@unique_fields) {