Changeset 25027 for branches/pap/ippScripts/scripts/detrend_norm_calc.pl

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippScripts/scripts/detrend_norm_calc.pl (modified) (4 diffs)

branches/pap/ippScripts/scripts/detrend_norm_calc.pl

@@ -33 +33 @@
 
 # Parse command-line arguments
-my ($det_id, $iter, $detType, $outroot, $dbname, $verbose, $no_update, $no_op, $redirect );
+my ($det_id, $iter, $det_type, $outroot, $dbname, $verbose, $no_update, $no_op, $redirect );
 GetOptions(
     'det_id|d=s'        => \$det_id,    # Detrend id
     'iteration|i=s'     => \$iter,      # Iteration
-    'det_type|t=s'      => \$detType,   # Detrend type
+    'det_type|t=s'      => \$det_type,   # Detrend type
     'outroot|w=s'       => \$outroot,   # output file base name
     'dbname|d=s'        => \$dbname,    # Database name
@@ -52 +52 @@
     defined $det_id  and
     defined $iter    and
-    defined $detType and
+    defined $det_type and
     defined $outroot;
+
+# force det_type to be upper-case in this script
+my $det_type = uc($det_type);
 
 my $ipprc = PS::IPP::Config->new() or my_die( "Unable to set up", $det_id, $iter, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
@@ -64 +67 @@
 # Define which detrend types we normalise
 use constant NORMALIZE => {
-    'bias'             => 0,
-    'dark'             => 0,
-    'dark_premask'     => 0,
-    'shutter'          => 0,
-    'flat_premask'     => 1,
-    'domeflat_premask' => 1,
-    'skyflat_premask'  => 1,
-    'flat_raw'         => 1,
-    'domeflat_raw'     => 1,
-    'skyflat_raw'      => 1,
-    'flat'             => 1,
-    'domeflat'         => 1,
-    'skyflat'          => 1,
-    'fringe'           => 0,
-    'mask'             => 0,
-    'darkmask'         => 0,
-    'flatmask'         => 0,
-    'ctemask'          => 0,
+    'BIAS'             => 0,
+    'DARK'             => 0,
+    'DARK_PREMASK'     => 0,
+    'SHUTTER'          => 0,
+    'FLAT_PREMASK'     => 1,
+    'DOMEFLAT_PREMASK' => 1,
+    'SKYFLAT_PREMASK'  => 1,
+    'FLAT_RAW'         => 1,
+    'DOMEFLAT_RAW'     => 1,
+    'SKYFLAT_RAW'      => 1,
+    'FLAT'             => 1,
+    'DOMEFLAT'         => 1,
+    'SKYFLAT'          => 1,
+    'FRINGE'           => 0,
+    'MASK'             => 0,
+    'DARKMASK'         => 0,
+    'FLATMASK'         => 0,
+    'CTEMASK'          => 0,
+    'DARKTEST'         => 0,
     };
 
-&my_die("Unrecognised detrend type: $detType", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless exists NORMALIZE()->{lc($detType)};
+&my_die("Unrecognised detrend type: $det_type", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless exists NORMALIZE()->{$det_type};
 
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
@@ -124 +128 @@
 
 my $norms;                      # MDC with normalisations
-if (NORMALIZE()->{lc($detType)} and not $no_op) {
+if (NORMALIZE()->{$det_type} and not $no_op) {
 
     my %matrix; # Matrix of statistics as a function of exposures and classes