Changeset 27211 for trunk/pstamp/scripts

Timestamp:

Mar 5, 2010, 1:47:06 PM (16 years ago)

Author:

bills

Message:

add support for making stamps from unconvolved stacks and if
REQFILT is a single charcter append a '%' character

Location:

trunk/pstamp/scripts

Files:

• pstamp_insert_request.pl (modified) (1 diff)
• pstamp_server_status (modified) (3 diffs)
• pstampparse.pl (modified) (7 diffs)

trunk/pstamp/scripts/pstamp_insert_request.pl

@@ -95 +95 @@
     $command .= " -dbname $dbname" if $dbname;
     $command .= " -dbserver $dbserver" if $dbserver;
+    $command .= " -label WEB.UP";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);

trunk/pstamp/scripts/pstamp_server_status

@@ -88 +88 @@
         my ($task_state, $task, $nrun, $njobs, $ngood, $nfail, $ntime, $cmd) = split " ", $line;
 #        print "$task $task_state\n";
-        my %this_task = ( name => $task, njobs => $njobs, ngood => $ngood, nfail => $nfail, ntime => $ntime, cmd => $cmd ); 
+        my %this_task = ( name => $task, nrun=> $nrun, njobs => $njobs, ngood => $ngood, nfail => $nfail, ntime => $ntime, cmd => $cmd ); 
 
         # change '.' in task name to '_' so we have a valid hash key
@@ -116 +116 @@
 
 if ($request_run) {
-    print "$request_run->{ngood} of $request_run->{njobs} Requests parsed successfully.";
+    print "<b>Parser Status:</b> $request_run->{nrun} running. $request_run->{ngood} parsed successfully.&nbsp; $request_run->{nfail} failed to parse.";
     if ($request_fin) {
         print "  $request_fin->{ngood} Requests finished.";
@@ -125 +125 @@
     print "\n";
     if ($job_run) {
-        print "$job_run->{ngood} of $job_run->{njobs} Jobs run successfully.";
+        print "<b>Job Status:</b> &nbsp;&nbsp; $job_run->{nrun} running. &nbsp; $job_run->{ngood} completed successfully. &nbsp; $job_run->{nfail} failed";
         print "\n";
     } else {

trunk/pstamp/scripts/pstampparse.pl

@@ -191 +191 @@
 
     my $filter  = $row->{REQFILT};
+    if ($filter) {
+        if (length($filter) == 1) {
+            # allow single character filter cuts to work
+            $filter .= '%';
+        }
+    }
     my $mjd_min = $row->{MJD_MIN};
     my $mjd_max = $row->{MJD_MAX};
@@ -198 +204 @@
         $data_group = $row->{LABEL};
         $data_group = "null" if !defined $data_group;
+        $row->{DATA_GROUP} = $data_group;
     }
         
@@ -206 +213 @@
     my $inverse = ($option_mask & $PSTAMP_SELECT_INVERSE) ? 1 : 0;
     $row->{inverse} = $inverse;
+    my $unconvolved = ($option_mask & $PSTAMP_SELECT_UNCONV) ? 1 : 0;
+    $row->{unconvolved} = $unconvolved;
 
     my $skycenter = $row->{skycenter} = ! ($row->{COORD_MASK} & $PSTAMP_CENTER_IN_PIXELS);
@@ -228 +237 @@
     }
 
+    if (($req_type eq "byexp") and ($stage eq "stack")) {
+        print STDERR "byexp not implemented for stack stage. row: $rownum\n" if $verbose;
+        insertFakeJobForRow($row, 1, $PSTAMP_NOT_IMPLEMENTED);
+        $num_jobs++;
+        next;
+    }
+
     
     # $mode list_uri is a debugging mode (it may used by the http interface)
@@ -273 +289 @@
     # request specification. An array reference is returned.
     $imageList = locate_images($ipprc, $image_db, $req_type, $stage, $id, $tess_id, $search_component,
-                $inverse, $need_magic, $x, $y, $mjd_min, $mjd_max, $filter, $data_group, $verbose);
+                $option_mask, $need_magic, $x, $y, $mjd_min, $mjd_max, $filter, $data_group, $verbose);
 
     if (!$imageList or !@$imageList) {
@@ -385 +401 @@
         }
 
-        my $base = basename($image->{path_base});
+        my $base = basename($image->{image});
+        if (! $base =~ /.fits$/ ) {
+            my_die("unexpected image file name found $image->{image}", $PS_EXIT_PROG_ERROR);
+        }
+        $base =~ s/.fits$//;
+            
         # XXX: TODO use filerule for this. I don't have a camera defined here
         if (($stage eq 'chip') and ($image->{camera} eq 'GPC1')) {
@@ -815 +836 @@
     return 0 if ($r1->{MJD_MAX}  ne $r2->{MJD_MAX});
     return 0 if ($r1->{inverse}  ne $r2->{inverse});
+    return 0 if ($r1->{unconvolved}  ne $r2->{unconvolved});
 
     if (defined($r1->{COMPONENT})) {