Changeset 11333

Timestamp:

Jan 26, 2007, 3:10:21 PM (19 years ago)

Author:

Paul Price

Message:

Fixing problem with resolving directories using PS::IPP::Config->datapath() --- use of File::Spec->catfile on $workdir = path://SOMETHING/ produced path:/SOMETHING/ which then killed the URI parsing in PS::IPP::Config->convert_filename_absolute().

Location:

trunk/ippScripts/scripts

Files:

• detrend_norm_apply.pl (modified) (2 diffs)
• detrend_norm_exp.pl (modified) (2 diffs)
• detrend_process_exp.pl (modified) (2 diffs)
• detrend_process_imfile.pl (modified) (2 diffs)
• detrend_reject_imfile.pl (modified) (2 diffs)
• detrend_resid.pl (modified) (2 diffs)
• detrend_stack.pl (modified) (2 diffs)
• phase2.pl (modified) (2 diffs)
• phase3.pl (modified) (2 diffs)

trunk/ippScripts/scripts/detrend_norm_apply.pl

@@ -74 +74 @@
 }
 
-unless (defined $workdir) {
+if (defined $workdir) {
+    $workdir = $ipprc->convert_filename_absolute( $workdir );
+} else {
     my ($vol, $dir, $file) = File::Spec->splitpath( $input );
     $workdir = $dir;
@@ -83 +85 @@
 my $outputRoot = $camera . '.' . $detType . '.norm.' . $detId . '.' . $iter; # Root output name
 $outputRoot = File::Spec->catfile( $workdir, $outputRoot );
-$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
 
 my $output = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $classId);

trunk/ippScripts/scripts/detrend_norm_exp.pl

@@ -108 +108 @@
 }
 
-unless (defined $workdir) {
+if (defined $workdir) {
+    $workdir = $ipprc->convert_filename_absolute( $workdir );
+} else {
     my $example = ${$files}[0]->{b1_uri}; # Example file, for path
     my ($vol, $dir, $file) = File::Spec->splitpath( $example );
@@ -117 +119 @@
 my $outputRoot = $camera . '.' . $det_type . '.norm.' . $det_id . '.' . $iter; # Root output name
 $outputRoot = File::Spec->catfile( $workdir, $outputRoot );
-$outputRoot = $ipprc->convert_filename_absolute( $outputRoot );
 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

trunk/ippScripts/scripts/detrend_process_exp.pl

@@ -106 +106 @@
 }
 
-unless (defined $workdir) {
+if (defined $workdir) {
+    $workdir = $ipprc->convert_filename_absolute( $workdir );
+} else {
     my $example = ${$files}[0]->{b1_uri}; # Example filename
     my ($vol, $dir, $file) = File::Spec->splitpath( $example );
@@ -115 +117 @@
 my $outputRoot = $exp_tag . '.detproc.' . $det_id; # Root output name
 $outputRoot = File::Spec->catfile( $workdir, $outputRoot );
-$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
 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

trunk/ippScripts/scripts/detrend_process_imfile.pl

@@ -81 +81 @@
 
 ### Output file name
-unless (defined $workdir) {
+if (defined $workdir) {
+    $workdir = $ipprc->convert_filename_absolute( $workdir );
+} else {
     my ($vol, $dir, $file) = File::Spec->splitpath( $input_uri );
     $workdir = $dir;
@@ -87 +89 @@
 my $outputRoot = $exp_tag . '.detproc.' . $det_id; # Root name
 $outputRoot = File::Spec->catfile( $workdir, $outputRoot );
-$outputRoot = $ipprc->convert_filename_absolute( $outputRoot );
+print "OUTPUTROOT: $outputRoot\n";
 $input_uri = $ipprc->convert_filename_absolute( $input_uri );
 

trunk/ippScripts/scripts/detrend_reject_imfile.pl

@@ -86 +86 @@
 }
 
-unless (defined $workdir) {
+if (defined $workdir) {
+    $workdir = $ipprc->convert_filename_absolute( $workdir );
+} else {
     my $example = ${$files}[0]->{b1_uri}; # Example file
     my ($vol, $dir, $file) = File::Spec->splitpath( $example );
@@ -95 +97 @@
 my $outputRoot = $exp_tag . '.detresid.' . $det_id . '.' . $iter; # Root output name
 $outputRoot = File::Spec->catfile( $workdir, $outputRoot );
-$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
 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

trunk/ippScripts/scripts/detrend_resid.pl

@@ -111 +111 @@
 
 ### Output file names --- must match camera configuration!
-unless (defined $workdir) {
+if (defined $workdir) {
+    $workdir = $ipprc->convert_filename_absolute( $workdir );
+} else {
     my ($vol, $dir, $file) = File::Spec->splitpath( $input_uri );
     $workdir = $dir;
@@ -117 +119 @@
 my $outputRoot = $exp_tag . '.detresid.' . $det_id . '.' . $iter; # Root name
 $outputRoot = File::Spec->catfile( $workdir, $outputRoot );
-$outputRoot = $ipprc->convert_filename_absolute( $outputRoot );
 $input_uri = $ipprc->convert_filename_absolute( $input_uri );
 $detrend = $ipprc->convert_filename_absolute( $detrend ) if defined $detrend;

trunk/ippScripts/scripts/detrend_stack.pl

@@ -91 +91 @@
 }
 
-unless (defined $workdir) {
+if (defined $workdir) {
+    $workdir = $ipprc->convert_filename_absolute( $workdir );
+} else {
     my $example = ${$files}[0]->{uri}; # Example file
     my ($vol, $dir, $file) = File::Spec->splitpath( $example );
@@ -100 +102 @@
 my $outputRoot = $camera . '.' . $det_type . '.' . $det_id . '.' . $iter . '.' . $class_id; # Root name
 $outputRoot = File::Spec->catfile( $workdir, $outputRoot );
-$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
 my $outputStack = $outputRoot . '.fits'; # Output name
 my $outputStats = $outputRoot . '.stats'; # Statistics name

trunk/ippScripts/scripts/phase2.pl

@@ -64 +64 @@
 }
 
-unless (defined $workdir) {
+if (defined $workdir) {
+    $workdir = $ipprc->convert_filename_absolute( $workdir );
+} else {
     my ($vol, $dir, $file) = File::Spec->splitpath( $input );
     $workdir = $dir;
@@ -72 +74 @@
 my $outputRoot =  $exp_tag . '.p2';
 $outputRoot = File::Spec->catfile( $workdir, $outputRoot );
-$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
 $input = $ipprc->convert_filename_absolute ( $input );
 

trunk/ippScripts/scripts/phase3.pl

@@ -113 +113 @@
 }
 
-unless (defined $workdir) {
+if (defined $workdir) {
+    $workdir = $ipprc->convert_filename_absolute( $workdir );
+} else {
     my $example = ${$files}[0]->{b1_uri}; # Example filename
     my ($vol, $dir, $file) = File::Spec->splitpath( $example );
@@ -122 +124 @@
 my $outputRoot = $exp_tag . '.p3'; # Root output name
 $outputRoot = File::Spec->catfile( $workdir, $outputRoot );
-$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
 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