Changeset 9185

Timestamp:

Oct 3, 2006, 6:00:02 PM (20 years ago)

Author:

Paul Price

Message:

Adding path support.

File:

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

trunk/ippScripts/scripts/detrend_norm_apply.pl

@@ -6 +6 @@
 use IPC::Cmd qw( can_run run );
 use Data::Dumper;
+
+use PS::IPP::Config;
+my $ipprc = PS::IPP::Config->new(); # IPP configuration
+use File::Spec;
 
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
@@ -51 +55 @@
 die "Can't find required tools.\n" if $missing_tools;
 
+my ($vol, $dir, $file) = File::Spec->splitpath( $input );
+$input = File::Spec->rel2abs( $input, $ipprc->workdir() );
+
 # Output name
 my $outputRoot = $camera . '.' . $detType . '.norm.' . $detId . '.' . $iter; # Root output name
+$outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
 my $output = $outputRoot . '.' . $classId . '.fits'; # Main output file
 my $b1name = $outputRoot . '.' . $classId . '.b1.fits'; # Output file with binning 1
@@ -58 +66 @@
 my $statsName = $outputRoot . '.' . $classId . '.stats'; # Statistics file
 
-# Run ppArith
+# Run normalisation
 {
     my $command = "$ppImage -file $input $outputRoot -norm $value -stat $statsName -recipe PPIMAGE " . RECIPE(); # Command to run
@@ -84 +92 @@
 }
 
-
 # Update the database
+$output = File::Spec->abs2rel( $output, $ipprc->workdir() );
+$b1name = File::Spec->abs2rel( $b1name, $ipprc->workdir() );
+$b2name = File::Spec->abs2rel( $b2name, $ipprc->workdir() );
 unless ($no_update) {
     my $command = "$dettool -addnormalizedimfile -det_id $detId -iteration $iter -class_id $classId ".
@@ -102 +112 @@
     die "Unable to perform dettool -addnormalizedimfile: $error_code\n"
         if not $success;
+
+    unlink $statsName;
 }