Changeset 26919 for trunk/ippScripts/scripts/automate_stacks.pl

Timestamp:

Feb 11, 2010, 5:21:29 PM (16 years ago)

Author:

watersc1

Message:

Changes to half-way switch from comment triggering to obs_mode triggering.

File:

• trunk/ippScripts/scripts/automate_stacks.pl (modified) (10 diffs)

trunk/ippScripts/scripts/automate_stacks.pl

@@ -121 +121 @@
 my @filter_list = ();
 my %tessID_list = ();
+my %obsmode_list = ();
+my %object_list = ();
 my %comment_list= ();
 my %stackable_list = ();
@@ -153 +155 @@
             elsif (${ $tentry }{name} eq 'TESS') {
                 $tessID_list{$this_target} = ${ $tentry }{value};
+            }
+            elsif (${ $tentry }{name} eq 'OBSMODE') {
+                $obsmode_list{$this_target} = ${ $tentry }{value};
+            }
+            elsif (${ $tentry }{name} eq 'OBJECT') {
+                $object_list{$this_target} = ${ $tentry }{value};
             }
             elsif (${ $tentry }{name} eq 'COMMENT') {
@@ -438 +446 @@
     my $target = shift;
 
-    my ($label,$workdir,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);
+    my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);
     
     my $select =  "-dateobs_begin ${date}T00:00:00 -dateobs_end ${date}T23:59:59 ";
@@ -447 +455 @@
     $cmd .= " -set_label $label ";
     $cmd .= " -set_workdir $workdir -set_dist_group $dist_group ";
-    $cmd .= " -set_tess_id $tess_id -comment '$comment' -set_data_group $data_group ";
+    $cmd .= " -set_tess_id $tess_id -set_data_group $data_group ";
+    if (defined($obs_mode)) {
+        $cmd .= " -obs_mode '$obs_mode' ";
+    }
+    if (defined($object)) {
+        $cmd .= " -object '$object' ";
+    }
+    if (defined($comment)) {
+        $cmd .= " -comment '$comment' ";
+    }
     $cmd .= " $select ";
     if ($debug == 1) {
@@ -463 +480 @@
     my $db = init_gpc_db();
     $date =~ s/-//g;
-    my ($label,$workdir,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);
+    my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);
 
     my $sth = "SELECT exp_id from chipRun where data_group = '$data_group' AND exp_id = $exp_id";
@@ -548 +565 @@
     my $filter = shift;
 
-    my ($label,$workdir,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);
+    my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);
 
     my $select =  "-select_dateobs_begin ${date}T00:00:00 -select_dateobs_end ${date}T23:59:59 ";
@@ -575 +592 @@
     my $db = init_gpc_db();
     $date =~ s/-//g;
-    my ($label,$workdir,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);
+    my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);
 
     my $sth = "SELECT skycell_id from stackRun where data_group = '$data_group' AND skycell_id = '$skycell' AND filter = '$filter'";
@@ -588 +605 @@
     my $filter = shift;
 
-    my ($label,$workdir,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);
+    my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);
     # check warp stage == chip stage
     my $db = init_gpc_db();
@@ -688 +705 @@
     my $cleaning_date = $dt->ymd;
 
-    my ($label,$workdir,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($cleaning_date,$target);
+    my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($cleaning_date,$target);
 
     my $args .= " -dbname gpc1 -updaterun -set_state goto_cleaned -state full -data_group $data_group ";
@@ -745 +762 @@
     my $label = "${target}.nightlyscience";
     my $workdir = "neb://\@HOST\@.0/gpc1/${target}.nt/${workdir_date}";
+    my $obs_mode = $obsmode_list{$target};
+    my $object   = $object_list{$target};
     my $comment = $comment_list{$target};
     my $dist_group = $target;
     my $data_group = "${target}.${trunc_date}";
     my $tess_id = $tessID_list{$target};
-    return($label,$workdir,$comment,$tess_id,$dist_group,$data_group);
+
+    return($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group);
 }