Changeset 27838 for branches/tap_branches/ippScripts/scripts/addstar_run.pl

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• ippScripts/scripts/addstar_run.pl (modified) (4 diffs)

branches/tap_branches/ippScripts/scripts/addstar_run.pl

@@ -8 +8 @@
 use Sys::Hostname;
 my $host = hostname();
+my $date = `date`;
 print "\n\n";
-print "Starting script $0 on $host\n\n";
+print "Starting script $0 on $host at $date\n\n";
 
 use DateTime;
@@ -63 +64 @@
     defined $add_id and
     defined $outroot and
+    defined $camroot and
     defined $camera;
 
@@ -104 +106 @@
     if (defined $dvodbReal) {
 
-        ## addstar can either save the full set of detections, or just
-        ## the image metadata, in the dvodb.  this is set in the
-        ## database table addRun
-        
-        # addstar requires the user to have a valid .ptolemyrc which
-        # in turn points at ippconfig/dvo.site
+        ## addstar can either save the full set of detections, or just
+        ## the image metadata, in the dvodb.  this is set in the
+        ## database table addRun
 
-        # get the names for the camera and the real input file
-        my $camdir = $ipprc->dvo_cameradir(); # Camera directory for addstar
-        my $realFile = $ipprc->file_resolve($fpaObjects);
+        # addstar requires the user to have a valid .ptolemyrc which
+        # in turn points at ippconfig/dvo.site
 
-        # require a defined output dvo database to run addstar (ie, refuse to use the .ptolemyrc default)
-        my $command  = "$addstar -update"; # XXX optionally set -update?
-        $command .= " -D CAMERA $camdir";
-        $command .= " -D CATDIR $dvodbReal";
-        $command .= " $realFile";
-        $command .= " -use-name $fpaObjects"; # DVO wants the neb-name as a file reference
-        $command .= " -image" if $image_only;
-        
-        my $mjd_addstar_start = DateTime->now->mjd;   # MJD of starting script
-        
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
-        unless ($success) {
-            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &my_die("Unable to perform addstar: $error_code", $add_id, $error_code);
-        }
-        $dtime_addstar = 86400.0*(DateTime->now->mjd - $mjd_addstar_start);   # MJD of starting script
+        # get the names for the camera and the real input file
+        my $camdir = $ipprc->dvo_cameradir(); # Camera directory for addstar
+        my $realFile = $ipprc->file_resolve($fpaObjects) or &my_die("Unable to resolve $fpaObjects", $add_id, $PS_EXIT_SYS_ERROR);
+
+        # require a defined output dvo database to run addstar (ie, refuse to use the .ptolemyrc default)
+        my $command  = "$addstar -update"; # XXX optionally set -update?
+        $command .= " -D CAMERA $camdir";
+        $command .= " -D CATDIR $dvodbReal";
+        $command .= " $realFile";
+        $command .= " -use-name $fpaObjects"; # DVO wants the neb-name as a file reference
+        $command .= " -image" if $image_only;
+
+        my $mjd_addstar_start = DateTime->now->mjd;   # MJD of starting script
+
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &my_die("Unable to perform addstar: $error_code", $add_id, $error_code);
+        }
+        $dtime_addstar = 86400.0*(DateTime->now->mjd - $mjd_addstar_start);   # MJD of starting script
     }
 }
@@ -166 +168 @@
     carp($msg);
     if (defined $add_id and not $no_update) {
-# This needs to be updated when addtool is written. BROKEN
         my $command = "$addtool -add_id $add_id";
-        $command .= " -addprocessedexp";
-        $command .= " -fault $exit_code";
-        $command .= " -path_base $outroot" if defined $outroot;
-        $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400));
+        $command .= " -addprocessedexp";
+        $command .= " -fault $exit_code";
+        $command .= " -path_base $outroot" if defined $outroot;
+        $command .= (" -dtime_addstar " . ((DateTime->now->mjd - $mjd_start) * 86400));
         $command .= " -dbname $dbname" if defined $dbname;
         system ($command);