Changeset 8327

Timestamp:

Aug 14, 2006, 12:52:27 PM (20 years ago)

Author:

Paul Price

Message:

Added exp_type to phase0imfile.pl, so that phase0exp.pl can access the types, check for consistency, and decide if it's a detrend

Location:

trunk/ippScripts/scripts

Files:

• phase0exp.pl (modified) (6 diffs)
• phase0imfile.pl (modified) (2 diffs)

trunk/ippScripts/scripts/phase0exp.pl

@@ -10 +10 @@
 use Data::Dumper;
 
-use constant TYPE => "OBSTYPE"; # Observation type keyword
-use constant DETRENDS => ( "bias", "dark", "flat", "fringe" ); # Observation types to mark as detrend
+use constant TYPE => "exp_type"; # Observation type keyword
+use constant DETRENDS => [ "bias", "dark", "flat", "fringe" ]; # Observation types to mark as detrend
 use constant DETREND_FLAG => "-detrend"; # Flag to use to mark detrend exposure
 
@@ -84 +84 @@
         if (not defined $values{$constant}) {
             $values{$constant} = $value;
-        } elsif ($values{$constant} != $value) {
+        } elsif ($values{$constant} ne $value) {
             die "Value of $constant for " . $imfile->{PHASE0_CLASSID} .
                 " doesn't match previous value.\n";
@@ -120 +120 @@
     foreach my $variable (@{VARIABLES()}) {
         my $array = $values{$variable}; # Array of values
-        my $stats = Statistics::Descriptive->new; # Statistics calculator
+        my $stats = Statistics::Descriptive::Sparse->new; # Statistics calculator
         $stats->add_data(@$array);
         $command .= " -" . $variable . " " . $stats->mean();
@@ -127 +127 @@
     # Add the statistics
     {
-        my $stats = Statistics::Descriptive->new; # Statistics calculator
+        my $stats = Statistics::Descriptive::Sparse->new; # Statistics calculator
         $stats->add_data(@backgrounds);
         $command .= " -" . PHASE0_BG() . " " . $stats->mean();
@@ -133 +133 @@
     }
     {
-        my $stats = Statistics::Descriptive->new; # Statistics calculator
+        my $stats = Statistics::Descriptive::Sparse->new; # Statistics calculator
         $stats->add_data(@stdevs);
         $command .= " -" . PHASE0_BG_MEAN_STDEV() . " " . $stats->mean();
@@ -146 +146 @@
     }
  
-    print "$command\n";
-   
-#    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-#       run(command => $command, verbose => 1);
-#    die "Unable to run phase0 update for $expid: $error_code\n" if not $success;
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => 1);
+    die "Unable to run phase0 update for $expid: $error_code\n" if not $success;
 }
 

trunk/ippScripts/scripts/phase0imfile.pl

@@ -14 +14 @@
 # The key is the name in the ppStats output; the value is the switch for "phase0 -updateexp"
 use constant CONSTANTS => {
+    "OBSTYPE"      => "-exp_type", # Exposure type
     "FPA.FILTER"   => "-filter", # Filter used
     "FPA.AIRMASS"  => "-airmass", # Airmass
@@ -21 +22 @@
     "TELAZ"        => "-az",    # Azimuth
     "DETTEM"       => "-ccd_temp", # CCD temperature
-    "FPA.POSANGLE" => "-posang", # Position angle
+    "FPA.POSANGLE" => "-posang" # Position angle
     };