Changeset 38943 for trunk/ippScripts

Timestamp:

Oct 22, 2015, 2:23:44 PM (11 years ago)

Author:

watersc1

Message:

Final version of full force summary addstar changes. Typos fixed, sql fixed, addstar_run.pl now explicitly requires a dbname entry, task updated with revert code.

File:

• trunk/ippScripts/scripts/addstar_run.pl (modified) (6 diffs)

trunk/ippScripts/scripts/addstar_run.pl

@@ -70 +70 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-          -msg => "Required options: --add_id --camera --outroot --dvodb --stageroot --stage",
+          -msg => "Required options: --add_id --camera --outroot --dvodb --stageroot --stage --dbname",
           -exitval => 3,
           ) unless
@@ -78 +78 @@
     defined $stageroot and
     defined $dvodb and
+    defined $dbname and
     defined $camera;
 if ($stage =~ /cam/ && !defined $stage_id) {
@@ -309 +310 @@
     
     unless ($no_op) {
-            print $dvodbReal;
+            print "$dvodbReal\n";
             ## addstar can either save the full set of detections, or just
             ## the image metadata, in the dvodb.  this is set in the
@@ -338 +339 @@
 
             if ($stage ne 'fullforce_summary') {
+#               print "IN ADDSTAR VERSION\n";
                 # require a defined output dvo database to run addstar (ie, refuse to use the .ptolemyrc default)
                 $command  = "$addstar -update"; # XXX optionally set -update?
@@ -360 +362 @@
             }
             else { # Full force summary case
+#               print "IN LOADGALPHOT VERSION\n";
                 # We need to know the filter to set up the photcode, as the summaries do not include that in the header.
                 # We /could/ set up the addtool stuff to pass that in to the script when needed, but that would require adding 
@@ -368 +371 @@
                 {
                     my $ff_command = "$fftool -dbname ${dbname} -summary -ff_id ${stage_id}";
+                    print "$ff_command\n";
                     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                        run(command => $command, verbose => $verbose);
+                        run(command => $ff_command, verbose => $verbose);
                     unless ($success) {
                         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);