Changeset 24951 for branches/czw_branch/cleanup/ippScripts/scripts/detrend_norm_apply.pl

Timestamp:

Jul 30, 2009, 5:20:29 PM (17 years ago)

Author:

watersc1

Message:

Finished up my edits to the detrend cleanup, and some changes to my
copy of burntool and the pslib astrometry. Detrend cleanup has not
been tested yet. That's up next.

Location:

branches/czw_branch/cleanup

Files:

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

branches/czw_branch/cleanup/ippScripts/scripts/detrend_norm_apply.pl

@@ -62 +62 @@
     defined $outroot;
 
+# force det_type to be upper-case in this script
+$det_type = uc($det_type);
+
 my $ipprc = PS::IPP::Config->new( $camera ) or my_die( "Unable to set up", $det_id, $iter, $class_id, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
 
@@ -72 +75 @@
 # Define which detrend types we normalise
 use constant DETTYPE => {
-    'bias'             => 'bias',
-    'dark'             => 'dark',
-    'dark_premask'     => 'dark',
-    'shutter'          => 'shutter',
-    'flat_premask'     => 'flat',
-    'domeflat_premask' => 'flat',
-    'skyflat_premask'  => 'flat',
-    'flat_raw'         => 'flat',
-    'domeflat_raw'     => 'flat',
-    'skyflat_raw'      => 'flat',
-    'flat'             => 'flat',
-    'domeflat'         => 'flat',
-    'skyflat'          => 'flat',
-    'fringe'           => 'fringe',
-    'mask'             => 'mask',
-    'darkmask'         => 'mask',
-    'flatmask'         => 'mask',
-    'ctemask'          => 'mask',
+    'BIAS'             => 'BIAS',
+    'DARK'             => 'DARK',
+    'DARK_PREMASK'     => 'DARK',
+    'SHUTTER'          => 'SHUTTER',
+    'FLAT_PREMASK'     => 'FLAT',
+    'DOMEFLAT_PREMASK' => 'FLAT',
+    'SKYFLAT_PREMASK'  => 'FLAT',
+    'FLAT_RAW'         => 'FLAT',
+    'DOMEFLAT_RAW'     => 'FLAT',
+    'SKYFLAT_RAW'      => 'FLAT',
+    'FLAT'             => 'FLAT',
+    'DOMEFLAT'         => 'FLAT',
+    'SKYFLAT'          => 'FLAT',
+    'FRINGE'           => 'FRINGE',
+    'MASK'             => 'MASK',
+    'DARKMASK'         => 'MASK',
+    'FLATMASK'         => 'MASK',
+    'CTEMASK'          => 'MASK',
+    'DARKTEST'         => 'DARK',
     };
 
 # 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)};
+&my_die("Unrecognised detrend type: $det_type", $det_id, $iter, $class_id, $PS_EXIT_PROG_ERROR) unless exists DETTYPE()->{$det_type};
+my $det_type_real = DETTYPE()->{$det_type};
 
 &my_die("Couldn't find input file: $input_uri\n", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input_uri);
@@ -106 +110 @@
 $ipprc->outroot_prepare($outroot);
 
-my $outFile = ($det_type_real eq "mask") ? 'PPIMAGE.OUTPUT.DETMASK' : 'PPIMAGE.OUTPUT';; # XXXX something of a hack (too many places to control things...)
-
-my $RECIPE_PPSTATS = ($det_type_real eq "dark") ? 'DARKSTATS' : 'DETSTATS';; # 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 $RECIPE_PPSTATS = ($det_type_real eq "DARK") ? 'DARKSTATS' : 'DETSTATS';; # 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);
@@ -122 +126 @@
 
     # we cannot use ppImage to load a normalized mask : just copy it and build the jpeg images
-    if ($det_type_real eq 'mask') {
+    if ($det_type_real eq 'MASK') {
         $RECIPE_PPIMAGE = 'PPIMAGE_BIN';
         my $input_real = $ipprc->file_resolve($input_uri, 0);
@@ -134 +138 @@
     $command .= " -recipe PPSTATS $RECIPE_PPSTATS";
     $command .= " -F PPIMAGE.OUTPUT $outFile" unless $outFile eq 'PPIMAGE.OUTPUT';
-    $command .= ' -isfringe' if $det_type_real eq 'fringe';
-    $command .= ' -isdark' if $det_type_real 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;