Changeset 13680 for trunk/ippScripts/scripts

Timestamp:

Jun 6, 2007, 12:01:01 PM (19 years ago)

Author:

eugene

Message:

adjusting output names, using log filerules

Location:

trunk/ippScripts/scripts

Files:

• detrend_process_exp.pl (modified) (1 diff)
• detrend_process_imfile.pl (modified) (2 diffs)

trunk/ippScripts/scripts/detrend_process_exp.pl

@@ -149 +149 @@
 # Output files
 $workdir = caturi( $workdir, "$camera.$det_type.$det_id" ) if defined $workdir;
-my $outputRoot = $ipprc->file_prepare( "$exp_tag.detproc.$det_id", $workdir, ${$files}[0]->{path_base} );
+my $outputRoot = $ipprc->file_prepare( "$exp_tag/$exp_tag.detproc.$det_id", $workdir, ${$files}[0]->{path_base} );
 my $jpeg1 = $ipprc->filename("PPIMAGE.JPEG1", $outputRoot); # Binned JPEG #1
 my $jpeg2 = $ipprc->filename("PPIMAGE.JPEG2", $outputRoot); # Binned JPEG #2

trunk/ippScripts/scripts/detrend_process_imfile.pl

@@ -89 +89 @@
 $workdir = caturi( $workdir, "$camera.$det_type.$det_id" ) if defined $workdir;
 
-my $outputRoot = $ipprc->file_prepare( "$exp_tag.detproc.$det_id", $workdir, $input_uri );
+my $outputRoot = $ipprc->file_prepare( "$exp_tag/$exp_tag.detproc.$det_id", $workdir, $input_uri );
 my $outputImage = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $class_id);
 my $outputBin1 = $ipprc->filename("PPIMAGE.BIN1", $outputRoot, $class_id);
@@ -150 +150 @@
     my $exit_code = shift; # Exit code to add
 
-    warn($msg);
+    carp($msg);
     if ($det_id and $exp_tag and $class_id and not $no_update) {
         my $command = "$dettool -addprocessedimfile -det_id $det_id -exp_tag $exp_tag -class_id $class_id -code $exit_code";