Changeset 38943

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.

Location:

trunk

Files:

• ippScripts/scripts/addstar_run.pl (modified) (6 diffs)
• ippTasks/addstar.pro (modified) (3 diffs)
• ippTools/share/addtool_queue_ffsummary.sql (modified) (1 diff)
• ippTools/src/pxadd.c (modified) (1 diff)

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);

trunk/ippTasks/addstar.pro

@@ -85 +85 @@
     active false
   end
+  task addstar.revert.fullforce_summary
+    active false
+  end
 end
 
@@ -104 +107 @@
   end
   task addstar.revert.fullforce
+    active true
+  end
+  task addstar.revert.fullforce_summary
     active true
   end
@@ -484 +490 @@
     if ("$STAGE" == "fullforce_summary")
     # This shouldn't need a stage_extra1, as there are no subcomponents to the ff summary.
-      $run = $run --stage_id
+      $run = $run --stage_id $STAGE_ID
     end
 

trunk/ippTools/share/addtool_queue_ffsummary.sql

@@ -4 +4 @@
         'fullforce_summary',            -- stage
         ff_id,         -- stage_id
-        0,             -- stage_extra1
+        %d,            -- stage_extra1
         '%s',           -- state
         '%s',           -- workdir

trunk/ippTools/src/pxadd.c

@@ -171 +171 @@
         query = pxDataGet("addtool_queue_ff_id.sql");
         psMemSetPersistent(query, true);
+      }
+      else if (strcmp(stage,"fullforce_summary") == 0) {
+        query = pxDataGet("addtool_queue_ffsummary.sql");
+        psMemSetPersistent(query,true);
       }