Changeset 9180

Timestamp:

Oct 3, 2006, 5:47:25 PM (20 years ago)

Author:

Paul Price

Message:

Adding path handling.

Location:

trunk/ippScripts/scripts

Files:

• detrend_process_exp.pl (modified) (4 diffs)
• detrend_stack.pl (modified) (5 diffs)

trunk/ippScripts/scripts/detrend_process_exp.pl

@@ -11 +11 @@
 use PS::IPP::Metadata::List qw( parse_md_list );
 use Statistics::Descriptive;
+
+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 );
@@ -84 +88 @@
 }
 
+my $example = ${$files}[0]->{b1_uri}; # Example filename
+my ($vol, $dir, $file) = File::Spec->splitpath( $example );
+
 # Generate the file list, and get the statistics
 my $outputRoot = $exp_tag . '.detproc.' . $det_id; # Root output name
+$outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
 my $list1Name = $outputRoot . '.b1.list'; # Name for the input file list for binning 1
 my $list2Name = $outputRoot . '.b2.list'; # Name for the input file list for binning 2
@@ -93 +101 @@
 open my $list2File, '>' . $list2Name;
 foreach my $file (@$files) {
-    print $list1File $file->{b1_uri} . "\n";
-    print $list2File $file->{b2_uri} . "\n";
+    print $list1File File::Spec->rel2abs( $file->{b1_uri}, $ipprc->workdir() ) . "\n";
+    print $list2File File::Spec->rel2abs( $file->{b2_uri}, $ipprc->workdir() ) . "\n";
     push @means, $file->{bg};
     push @stdevs, $file->{bg_stdev};
@@ -121 +129 @@
 }
 
+
 # Add the result into the database
+$outputRoot = File::Spec->abs2rel( $outputRoot, $ipprc->workdir() );
 unless ($no_update) {
     my $command = "$dettool -addprocessedexp -det_id $det_id -exp_tag $exp_tag " .

trunk/ippScripts/scripts/detrend_stack.pl

@@ -11 +11 @@
 use PS::IPP::Metadata::List qw( parse_md_list );
 use PS::IPP::Metadata::Stats;
+
+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 );
@@ -73 +77 @@
 }
 
+my $example = ${$files}[0]->{uri}; # Example file
+my ($vol, $dir, $file) = File::Spec->splitpath( $example );
+
 # Stack the files
 my $outputRoot = $camera . '.' . $det_type . '.' . $det_id . '.' . $iter . '.' . $class_id; # Root name
+$outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
 my $outputStack = $outputRoot . '.fits'; # Output name
 my $outputStats = $outputRoot . '.stats'; # Statistics name
@@ -81 +89 @@
     foreach my $file (@$files) {
         my $uri = $file->{uri}; # URI for input file
+        $uri = File::Spec->rel2abs( $uri, $ipprc->workdir() );
         $command .= ' ' . $uri;
     }
@@ -93 +102 @@
     die "Unable to find expected output file: $outputStats\n" if not -f $outputStats;
 }
-
-### Could do some sort of JPEG generation here.
 
 # Get the statistics on the stacked image
@@ -112 +119 @@
 
 # Add the resultant into the database
+$outputStack = File::Spec->abs2rel( $outputStack, $ipprc->workdir() );
 unless ($no_update) {
     my $command = "$dettool -addstacked -det_id $det_id -iteration $iter -class_id $class_id" .