Changeset 18128 for trunk/ippScripts/scripts/detrend_norm_apply.pl

Timestamp:

Jun 13, 2008, 2:48:20 PM (18 years ago)

Author:

eugene

Message:

add the premask types

File:

• trunk/ippScripts/scripts/detrend_norm_apply.pl (modified) (3 diffs)

trunk/ippScripts/scripts/detrend_norm_apply.pl

@@ -64 +64 @@
 my $RECIPE_PPSTATS = 'CHIPSTATS'; # Recipe to use with ppStats
 
-my $isMaskType = 0;
-if (lc($det_type) eq "mask") { $isMaskType = 1; }
-if (lc($det_type) eq "darkmask") { $isMaskType = 1; }
-if (lc($det_type) eq "flatmask") { $isMaskType = 1; }
+# Define which detrend types we normalise
+use constant DETTYPE => {
+    'bias'             => 'bias',
+    'dark'             => 'dark',   
+    'dark_premask'     => 'dark',
+    'shutter'          => 'shutter',
+    'flat'             => 'flat',
+    'domeflat'         => 'flat',
+    'skyflat'          => 'flat',   
+    'flat_premask'     => 'flat',
+    'domeflat_premask' => 'flat',
+    'skyflat_premask'  => 'flat',
+    'fringe'           => 'fringe',   
+    'mask'             => 'mask',
+    'darkmask'         => 'mask',
+    'flatmask'         => 'mask',
+    }; 
+
+# convert supplied detrend type to a controlled namespace
+&my_die("Unrecognised detrend type: $det_type", $det_id, $iter, $class_id, $PS_EXIT_PROG_ERROR) unless exists DETTYPE()->{lc($det_type)};
+my $det_type_real = DETTYPE()->{lc($det_type)};
 
 # values to extract from output metadata and the stats to calculate
@@ -98 +115 @@
 $ipprc->outroot_prepare($outroot);
 
-my $outFile = $isMaskType ? 'PPIMAGE.OUTPUT.DETMASK' : 'PPIMAGE.OUTPUT';; # XXXX something of a hack (too many places to control things...)
+my $outFile = ($det_type_real eq "mask") ? 'PPIMAGE.OUTPUT.DETMASK' : 'PPIMAGE.OUTPUT';; # XXXX something of a hack (too many places to control things...)
 
 my $output    = $ipprc->filename($outFile,        $outroot, $class_id) or &my_die("Missing entry from camera config", $det_id, $iter, $class_id, $PS_EXIT_CONFIG_ERROR);
@@ -113 +130 @@
     $command .= " -recipe PPSTATS $RECIPE_PPSTATS";
     $command .= " -F PPIMAGE.OUTPUT $outFile" unless $outFile eq 'PPIMAGE.OUTPUT';
-    $command .= ' -isfringe' if lc($det_type) eq 'fringe';
-    $command .= ' -isdark' if lc($det_type) eq 'dark';
+    $command .= ' -isfringe' if $det_type_real eq 'fringe';
+    $command .= ' -isdark' if $det_type_real eq 'dark';
     $command .= " -tracedest $traceDest -log $logDest";
     $command .= " -dbname $dbname" if defined $dbname;