Changeset 33415 for branches/meh_branches/ppstack_test/ippScripts/scripts/register_exp.pl

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippScripts/scripts/register_exp.pl (modified) (5 diffs)

branches/meh_branches/ppstack_test/ippScripts/scripts/register_exp.pl

@@ -54 +54 @@
 
 my $ipprc = PS::IPP::Config->new() or my_die( "Unable to set up", $exp_id, $PS_EXIT_CONFIG_ERROR );
-$ipprc->redirect_output($logfile) or my_die( "Unable to redirect output", $exp_id, $PS_EXIT_SYS_ERROR ) if $logfile;
+$ipprc->redirect_to_logfile($logfile) or my_die( "Unable to redirect output", $exp_id, $PS_EXIT_SYS_ERROR ) if $logfile;
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
@@ -121 +121 @@
 my ($data_group,$dist_group,$chip_workdir,$reduction);
 ($label,$data_group,$dist_group,$end_stage,
- $tess_id,$chip_workdir,$reduction) = advance_decisions(&value_for_flag($cmdflags,"-dateobs"),
+ $tess_id,$chip_workdir,$reduction) = advance_decisions(&value_for_flag($cmdflags,"-exp_name"),
+                                                        &value_for_flag($cmdflags,"-dateobs"),
                                                         &value_for_flag($cmdflags,"-exp_type"),
                                                         &value_for_flag($cmdflags,"-obs_mode"),
@@ -170 +171 @@
 ### Pau.
 sub advance_decisions {
+    my $exp_name = shift;
     my $dateobs = shift;
     my $exptype = shift;
@@ -178 +180 @@
 
     # The strings come pre-quoted.
+    $exp_name =~ s/\'//g;
     $dateobs =~ s/\'//g;
     $exptype =~ s/\'//g;
@@ -188 +191 @@
     my $target;
 
+    if ($exp_name =~ /^c/) {
+        print "Skipping because this is a camera commanded exposure: $exp_name\n";
+        return(undef,undef,undef,"reg",undef,undef,undef);
+    }
+    
     if ($exptype ne 'OBJECT') {
         print "Skipping because exptype doesn't claim to be OBJECT: $exptype\n";