Changeset 9259

Timestamp:

Oct 4, 2006, 1:53:06 PM (20 years ago)

Author:

Paul Price

Message:

Adding path support

Location:

trunk/ippScripts/scripts

Files:

• detrend_reject_exp.pl (modified) (1 diff)
• detrend_resid.pl (modified) (4 diffs)

trunk/ippScripts/scripts/detrend_reject_exp.pl

@@ -164 +164 @@
             "-bg " . $meanStats->mean() . " -bg_stdev " . $stdevStats->mean() .
             " -bg_mean_stdev " . $meanStdevStats->mean();
-        $command .= " -reject" if not $master;
+        $command .= " -accept" if $master;
         
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =

trunk/ippScripts/scripts/detrend_resid.pl

@@ -11 +11 @@
 use PS::IPP::Metadata::Stats;
 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 );
@@ -71 +75 @@
 
 ### Output file names --- must match camera configuration!
+my ($vol, $dir, $file) = File::Spec->splitpath( $input_uri );
 my $outputRoot = $exp_tag . '.detresid.' . $det_id . '.' . $iter; # Root name
+$outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
+$input_uri = File::Spec->rel2abs( $input_uri, $ipprc->workdir() );
+$detrend = File::Spec->rel2abs( $detrend, $ipprc->workdir() );
 my $outputName = $outputRoot . '.' . $class_id . '.fits'; # Name for 
 my $outputStats = $outputRoot . '.' . $class_id . '.stats';
@@ -105 +113 @@
 
 # Add the processed file to the database
+$outputName = File::Spec->abs2rel ($outputName, $ipprc->workdir() );
+$bin1Name = File::Spec->abs2rel( $bin1Name, $ipprc->workdir() );
+$bin2Name = File::Spec->abs2rel( $bin2Name, $ipprc->workdir() );
 unless ($no_update) {
     my $command = "$dettool -addresidimfile -det_id $det_id -iteration $iter -exp_tag $exp_tag " .
@@ -122 +133 @@
     die "Unable to perform dettool -addprocessed for $det_id/$exp_tag/$class_id: $error_code\n"
         if not $success;
+
+    unlink $outputStats;    
 }
 
-unlink $outputStats if DELETE_STATS;
-
 __END__