Changeset 24964

Timestamp:

Jul 31, 2009, 3:36:46 PM (17 years ago)

Author:

bills

Message:

change CLASS_ID to COMPONENT add TESS_ID

Location:

trunk/pstamp/scripts

Files:

• pstamp_finish.pl (modified) (3 diffs)
• pstamp_results_file.pl (modified) (1 diff)

trunk/pstamp/scripts/pstamp_finish.pl

@@ -174 +174 @@
 
     my $exp_info;
-    my $last_exp_id = 0;
+    my $last_exp_id = -1;
     foreach my $job (@jobs) {
         my $job_id = $job->{job_id};
@@ -184 +184 @@
         my ($row, $req_info, $project) = get_request_info($rows, $rownum);
 
+        my $proj_hash = resolve_project($ipprc, $project, $dbname, $dbserver);
+        my $image_db = $proj_hash->{dbname};
+        if (!$image_db) {
+            carp("failed to find imagedb for project: $project");
+            stop_request($req_id, $PS_EXIT_CONFIG_ERROR);
+        }
+
         if ($exp_id ne $last_exp_id) {
-            my $proj_hash = resolve_project($ipprc, $project, $dbname, $dbserver);
-            my $image_db = $proj_hash->{dbname};
-            if (!$image_db) {
-                carp("failed to find imagedb for project: $project");
-                stop_request($req_id, $PS_EXIT_CONFIG_ERROR);
-            }
-
             # get the metadata for the exposure (if any i.e. stack) 
             # returns an appropriate string if !$exp_id
             $exp_info = get_exposure_info($image_db, $exp_id);
- # XXX: uncomment this and test
- #           $last_exp_id = $exp_id;
+            $last_exp_id = $exp_id;
         }
 
@@ -303 +302 @@
     # Create a results file module and provide a list of the names (we have the data in the columns)
     my $rowinfo = "$row->{PROJECT}|$row->{JOB_TYPE}|$row->{REQ_TYPE}|$row->{IMG_TYPE}|";
-    $rowinfo   .= "$row->{ID}|$row->{CLASS_ID}|$row->{OPTION_MASK}|$row->{MJD_MIN}|$row->{MJD_MAX}|";
+    $rowinfo   .= "$row->{ID}|$row->{TESS_ID}|$row->{COMPONENT}|$row->{OPTION_MASK}|$row->{MJD_MIN}|$row->{MJD_MAX}|";
     $rowinfo   .= "$row->{REQFILT}|$row->{COORD_MASK}|$row->{CENTER_X}|$row->{CENTER_Y}|";
     $rowinfo   .= "$row->{WIDTH}|$row->{HEIGHT}";

trunk/pstamp/scripts/pstamp_results_file.pl

@@ -88 +88 @@
         { name => 'IMG_TYPE',   type => '16A', writetype => TSTRING },       
         { name => 'ID',         type => '16A', writetype => TSTRING },            
-        { name => 'CLASS_ID',   type => '16A', writetype => TSTRING },    
+        { name => 'TESS_ID',    type => '64A', writetype => TSTRING },    
+        { name => 'COMPONENT',  type => '64A', writetype => TSTRING },    
 
         # output parameters