Changeset 29653

Timestamp:

Nov 3, 2010, 1:09:45 PM (16 years ago)

Author:

watersc1

Message:

Updated unlinked version of the stack queue code. This treats each target (MDXX,OSS,etc) as a separate item, and queues each as they become available. Probably needs a bit more testing, but manually running the script produces the expected results.

Location:

trunk

Files:

• ippScripts/scripts/automate_stacks.pl (modified) (3 diffs)
• ippTasks/nightly_stacks.pro (modified) (3 diffs)

trunk/ippScripts/scripts/automate_stacks.pl

@@ -1307 +1307 @@
 ################################################################################
 
+sub verify_uniqueness_diff {
+    my $warp_id_1 = shift;
+    my $warp_id_2 = shift;
+    my $date = shift;
+    my $target = shift;
+
+    my $db = init_gpc_db();
+    $date =~ s/-//g;
+    my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group,$reduction) = get_tool_parameters($date,$target);
+
+    my $sth = "SELECT diff_id from diffRun JOIN diffInputSkyfile USING(diff_id) where data_group = '$data_group' AND warp1 = $warp_id_1 AND warp2 = $warp_id_2";
+    my $data_ref = $db->selectall_arrayref( $sth );
+
+    return($#{ $data_ref } + 1);
+}
+
 sub do_extra_processing {
     my $date = shift;
@@ -1332 +1348 @@
             if (($#{ $warps } + 1) % 2 != 0) {
                 print STDERR "Number of input warps to make OSS diffs is not even! $#{ $warps }\n";
-                die;
+                last;
             }
             
@@ -1341 +1357 @@
                 my $template_exp_id = ${ $template_warp }[0];
                 
+                my $input_warp_id = ${ $input_warp }[1];
+                my $template_warp_id = ${ $template_warp }[1];
+
+                if (verify_uniqueness_diff($input_warp_id,$template_warp_id,$date,$target) != 0) {
+                    print STDERR "Diffs already queued for this $date $target $input_exp_id $template_exp_id\n";
+                    next;
+                }
+
                 my $cmd = "$difftool -dbname $dbname  -definewarpwarp ";
                 $cmd .= "-input_label $label  -template_label $label ";

trunk/ippTasks/nightly_stacks.pro

@@ -83 +83 @@
 macro ns.stacks.on
   task ns.stacks.load
-    active true
+    active false
   end
   task ns.stacks.run
@@ -531 +531 @@
 #
 task              ns.stacks.load
+  active          false
   host            local
   periods         -poll $LOADPOLL
@@ -617 +618 @@
      option $date
 
-     if ("$ns_STATE" != "QUEUESTACKS") break
+     if (("$ns_STATE" != "QUEUESTACKS")&&("$ns_STATE" != "TOWARP")&&("$ns_STATE" != "FORCETOWARP")) break
      $run = automate_stacks.pl --queue_stacks --date $date
      command $run