Changeset 28651

Timestamp:

Jul 9, 2010, 2:04:33 PM (16 years ago)

Author:

watersc1

Message:

nightly_science.config : merge in new detrend reference flats
detectability_respond.pl : fix typo that was causing faults and switch output format
make_burntool_pcontrol.pl : fix bug that was preventing STS data from being detected properly
automate_stacks.pl : fix typos, add single mode cleanup code

Location:

tags/ipp-20100701

Files:

• ippScripts/scripts/automate_stacks.pl (modified) (8 diffs)
• ippScripts/scripts/make_burntool_pcontrol.pl (modified) (1 diff)
• ippconfig/recipes/nightly_science.config (modified) (7 diffs)
• pstamp/scripts/detectability_respond.pl (modified) (2 diffs)

tags/ipp-20100701/ippScripts/scripts/automate_stacks.pl

@@ -41 +41 @@
 # Grab options
 my ( $date, $camera, $dbname, $logfile, $verbose, $manual);
-my ( $help, $isburning, $force_stack_count, $test_mode, $this_target_only, $this_filter_only, $check_mode);
+my ( $help, $isburning, $force_stack_count, $test_mode, $this_target_only, $this_filter_only, $this_mode_only, $check_mode);
 my ( $check_registration, $define_burntool, $queue_burntool, $check_chips, $queue_chips);
 my ( $check_stacks, $queue_stacks, $check_diffs, $queue_diffs, $clean_old);
@@ -60 +60 @@
     'this_target_only=s'   => \$this_target_only,
     'this_filter_only=s'   => \$this_filter_only,
+    'this_mode_only=s'     => \$this_mode_only,
     'check_registration'   => \$check_registration,
     'define_burntool'      => \$define_burntool,
@@ -87 +88 @@
            --this_target_only     Process only a single target.
            --this_filter_only     Process only a single filter.
+           --this_mode_only       Process only a single clean mode.
         Modes:
            --check_registration   Confirm the data downloaded correctly.
@@ -130 +132 @@
 my %detfilter_list = ();
 my %detmax_list = ();
+my @mode_list = ();
 my %clean_commands = ();
 my %clean_retention = ();
@@ -152 +155 @@
             if (${ $mentry }{name} eq 'MODE') {
                 $this_mode = ${ $mentry }{value};
+                push @mode_list, $this_mode;
             }
             elsif (${ $mentry }{name} eq 'COMMAND') {
@@ -264 +268 @@
     }
     die("$this_filter_only is invalid.") if ($#filter_list != 0);
+}
+
+if (defined($this_mode_only)) {
+    foreach my $t (@mode_list) {
+        if ($t eq $this_mode_only) {
+            @mode_list = ($this_mode_only);
+            last;
+        }
+    }
+    die("$this_mode_only is invalid.") if ($#mode_list != 0);
 }
 
@@ -842 +856 @@
     }
     if (($metadata_out{nsState} eq 'CHECKDETRENDS') && ($exposures > 0)) {
-        $metadata_out{nsState} eq 'QUEUE_DETRENDS';
+        $metadata_out{nsState} eq 'QUEUEDETRENDS';
     }
 }
@@ -1043 +1057 @@
     my $pretend = shift;
 
-    foreach my $mode (sort (keys (%clean_commands))) {
+    foreach my $mode (@mode_list) {
         if ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode} eq 'A')) {
             my ($cleaning_date,$command) = construct_cleantool_args($date,"",$mode);

tags/ipp-20100701/ippScripts/scripts/make_burntool_pcontrol.pl

@@ -328 +328 @@
         foreach my $target (@target_list) {
 #           print STDERR "$target $obsmode_list{$target} $exp_type $obs_mode $object $comment\n";
-            if (($obs_mode =~ /$obsmode_list{$target}/)&&
-                ($object   =~ /$object_list{$target}/)&&
-                ($comment  =~ /$comment_list{$target}/)) {
+            if (($obs_mode =~ /$obsmode_list{$target}/i)&&
+                ($object   =~ /$object_list{$target}/i)&&
+                ($comment  =~ /$comment_list{$target}/i)) {
                 $return_value = 1;
             }
-#           print ">$return_value $exp_type $obs_mode $object $comment $target $obsmode_list{$target} $object_list{$target} $comment_list{$target}\n";
+#           print ">$return_value $exp_type $obs_mode $object $comment <> $target $obsmode_list{$target} $object_list{$target} $comment_list{$target}\n";
             if ($return_value) {
                 return($return_value);

tags/ipp-20100701/ippconfig/recipes/nightly_science.config

@@ -15 +15 @@
   MODE STR DIFF
   COMMAND STR difftool
-# RETENTION_TIME U16 30
-  RETENTION_TIME S16 -1
+  RETENTION_TIME S16 30
+#  RETENTION_TIME S16 -1
 END
 CLEAN_MODES METADATA
   MODE STR DIST
-  COMMAND STR disttool -
+  COMMAND STR disttool 
   RETENTION_TIME S16 7
   ALTERNATE_CMD STR A
@@ -319 +319 @@
   DETTYPE  STR FLAT
   EXPTYPE  STR skyflat
-  REF_ID   S64 300
+  REF_ID   S64 278
   REF_ITER S32 0
   FILTER   STR g.00000
@@ -329 +329 @@
   DETTYPE  STR FLAT
   EXPTYPE  STR skyflat
-  REF_ID   S64 301
+  REF_ID   S64 279
   REF_ITER S32 0
   FILTER   STR r.00000
@@ -339 +339 @@
   DETTYPE  STR FLAT
   EXPTYPE  STR skyflat
-  REF_ID   S64 302
+  REF_ID   S64 280
   REF_ITER S32 0
   FILTER   STR i.00000
@@ -349 +349 @@
   DETTYPE  STR FLAT
   EXPTYPE  STR skyflat
-  REF_ID   S64 303
+  REF_ID   S64 281
   REF_ITER S32 0
   FILTER   STR z.00000
@@ -359 +359 @@
   DETTYPE  STR FLAT
   EXPTYPE  STR skyflat
-  REF_ID   S64 304
+  REF_ID   S64 282
   REF_ITER S32 0
   FILTER   STR y.00000
@@ -369 +369 @@
   DETTYPE  STR FLAT
   EXPTYPE  STR skyflat
-  REF_ID   S64 305
+  REF_ID   S64 283
   REF_ITER S32 0
   FILTER   STR w.00000

tags/ipp-20100701/pstamp/scripts/detectability_respond.pl

@@ -209 +209 @@
     $psphot_cmd .= "-mask $image_list_hash{$k}{MASK} ";
     $psphot_cmd .= "-variance $image_list_hash{$k}{WEIGHT} ";
-    $psphot_cmd .= "-srctext $targetname $image_list_hash{$k}{OUTROOT}";
+    $psphot_cmd .= "-srctext $targetname $image_list_hash{$k}{OUTROOT} ";
+    $psphot_cmd .= "-D OUTPUT.FORMAT PS1_DV1 ";
 
     ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -477 +478 @@
         }
         elsif ($col->{name} eq 'PSF_INST_MAG_SIG') {
-            @tmp_flux_err = map { $_ = $_ / (2.5 * log10(exp(1))) } @{ $col_data };
+            @tmp_flux_err = map { $_ = $_ / (2.5 * (log(exp(1)) / log(10))) } @{ $col_data };
             $correct_error = 1;
         }