Changeset 25027 for branches/pap/ippScripts/scripts/detrend_process_imfile.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_process_imfile.pl (modified) (3 diffs)

branches/pap/ippScripts/scripts/detrend_process_imfile.pl

@@ -63 +63 @@
     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, $exp_id, $class_id, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
 my $logDest = $ipprc->filename("LOG.IMFILE", $outroot, $class_id) or &my_die("Missing entry from camera config", $det_id, $exp_id, $class_id, $PS_EXIT_CONFIG_ERROR);
@@ -69 +72 @@
 # Recipes to use as a function of detrend type
 $reduction = "DETREND" unless defined $reduction;
-my $ppimage_recipe = $ipprc->reduction($reduction, uc($det_type) . '_PROCESS'); # Recipe name for ppImage
-my $jpeg_recipe = $ipprc->reduction($reduction, uc($det_type) . '_JPEG_IMAGE'); # Recipe name for JPEG
+my $ppimage_recipe = $ipprc->reduction($reduction, $det_type . '_PROCESS'); # Recipe name for ppImage
+my $jpeg_recipe = $ipprc->reduction($reduction, $det_type . '_JPEG_IMAGE'); # Recipe name for JPEG
 
 # The output file rule name depends on the detrend type
@@ -79 +82 @@
                   'DARK'             => undef,
                   'DARK_PREMASK'     => undef,
+                  'DARKTEST'         => undef,
                   'CTEMASK'          => undef,
                   'SHUTTER'          => 'PPIMAGE.OUTPUT.DETREND',