Changeset 29255

Timestamp:

Sep 28, 2010, 6:11:46 PM (16 years ago)

Author:

watersc1

Message:

Implement OSS code. Probably will need tweaks.

Location:

trunk

Files:

• ippScripts/scripts/automate_stacks.pl (modified) (6 diffs)
• ippconfig/recipes/nightly_science.config (modified) (2 diffs)

trunk/ippScripts/scripts/automate_stacks.pl

@@ -136 +136 @@
 my %cleanmods_list = ();
 my %stackable_list = ();
+my %extra_processing = ();
 my %reduction_class = ();
 my %macro_formats = ();
@@ -227 +228 @@
                 $stackable_list{$this_target} = ${ $tentry }{value};
             }
+            elsif (${ $tentry }{name} eq 'EXTRA_PROCESSING') {
+                $extra_processing{$this_target} = ${ $tentry }{value};
+            }
             elsif (${ $tentry }{name} eq 'REDUCTION') {
                 $reduction_class{$this_target} = ${ $tentry }{value};
@@ -1188 +1192 @@
         &my_die("Unable to perform stacktool: $error_code", 0,0,$date, $PS_EXIT_SYS_ERROR);
     }
+    
+    
     return(0);
 }
@@ -1195 +1201 @@
     my $pretend = shift;
     foreach my $target (@target_list) {
-        if ($stackable_list{$target} == 1) {
-            foreach my $filter (@filter_list) {
+        foreach my $filter (@filter_list) {
+            if (exists($extra_processing{$target})) {
+                do_extra_processing($date,$target,$filter,$pretend);
+            }
+            if ($stackable_list{$target} == 1) {
                 my ($Nexposures,$NprocChips,$NprocWarps,$Nalready) = pre_stack_queue($date,$target,$filter);
                 if ((!defined($force_stack_count))&&($NprocChips != $NprocWarps)) { # This makes me sad. :(
@@ -1236 +1245 @@
                 }
             }
+            else {
+                # print STDERR "execute_stacks: Target $target is not auto-stackable.\n";
+            }
         }
-        else {
-            # print STDERR "execute_stacks: Target $target is not auto-stackable.\n";
-        }
-    }
-
+    }
 }
 
@@ -1296 +1304 @@
 
 #
+# Extra processing
+################################################################################
+
+sub do_extra_processing {
+    my $date = shift;
+    my $target = shift;
+    my $filter = shift;
+    my $pretend = shift;
+    my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group,$reduction) = get_tool_parameters($date,$target);
+
+    if ($target eq 'OSS') {
+        my $db = init_gpc_db();
+
+        my $obj_sth = "select DISTINCT rawExp.object from warpRun JOIN fakeRun USING(fake_id) JOIN camRun USING(cam_id) JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id) ";
+        $obj_sth .= " WHERE warpRun.state = 'full' AND warpRun.label = '$label' AND warpRun.data_group = '$data_group' AND rawExp.filter = '$filter' ORDER BY rawExp.object";
+        print STDERR "$obj_sth\n";
+        my $object_ref = $db->selectall_arrayref( $obj_sth );
+
+        foreach my $object_row (@{ $object_ref }) {
+            my $this_object = shift @{ $object_row };
+            my $input_sth = "select exp_id,warp_id,dateobs from warpRun JOIN fakeRun USING(fake_id) JOIN camRun USING(cam_id) JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id) ";
+            $input_sth .= " WHERE warpRun.state = 'full' AND warpRun.label = '$label' AND warpRun.data_group = '$data_group' AND rawExp.filter = '$filter' AND rawExp.object = '$this_object' ";
+            $input_sth .= " ORDER BY dateobs ";
+
+            my $warps = $db->selectall_arrayref( $input_sth );
+            
+            if (($#{ $warps } + 1) % 2 != 0) {
+                print STDERR "Number of input warps to make OSS diffs is not even! $#{ $warps }\n";
+                die;
+            }
+            
+            while ($#{ $warps } > -1) {
+                my $input_warp = shift @{ $warps };
+                my $template_warp = shift @{ $warps };
+                my $input_exp_id = ${ $input_warp }[0];
+                my $template_exp_id = ${ $template_warp }[0];
+                
+                my $cmd = "$difftool  -definewarpwarp  -input_label $label  -template_label $label  -timediff 3600  -set_workdir $workdir  -set_dist_group $dist_group  -set_data_group $data_group ";
+                $cmd .= " -simple  -set_label $label -exp_id $input_exp_id -template_exp_id $template_exp_id ";
+                $cmd .= " -pretend ";
+                if (defined($pretend)) {
+                    $cmd .= ' -pretend ';
+                }
+                if ($debug == 1) {
+                    $cmd .= ' -pretend ';
+                }
+                print STDERR "EXTRA_PROCESSING: $cmd\n";
+                if (($debug == 0)&&(!defined($pretend))) {
+                    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                        run ( command => $cmd, verbose => $verbose );
+                    unless ($success) {
+                        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                        &my_die("Unable to perform difftool: $error_code", 0,0,$date, $PS_EXIT_SYS_ERROR);
+                    }
+                }
+            }
+        }
+    }
+}
+
+            
+
+
+#
 # Auto-Clean
 ################################################################################

trunk/ippconfig/recipes/nightly_science.config

@@ -37 +37 @@
 FILTERS STR z.00000
 FILTERS STR y.00000
+FILTERS STR w.00000
 
 UNRECOVERABLE_QUALITY MULTI
@@ -239 +240 @@
   OBSMODE STR OSS
   STACKABLE BOOL TRUE
+  EXTRA_PROCESSING BOOL TRUE
 END
 TARGETS METADATA