Changeset 11298 for trunk/ippScripts/scripts/phase2.pl

Timestamp:

Jan 25, 2007, 3:15:46 PM (19 years ago)

Author:

Paul Price

Message:

Adding -workdir to all scripts.

File:

• trunk/ippScripts/scripts/phase2.pl (modified) (4 diffs)

trunk/ippScripts/scripts/phase2.pl

@@ -22 +22 @@
     $input,                     # Input FITS file
     $camera,                    # Camera
-    $outpath,                   # Outpath
     $dbname,                    # Database name
+    $workdir,                   # Working directory, for output files
     $no_update                  # Don't update the database?
     );
@@ -31 +31 @@
     'uri|u=s'       => \$input,
     'camera|c=s'    => \$camera,
-    'outpath|o=s'   => \$outpath,
     'dbname|d=s'    => \$dbname, # Database name
+    'workdir|w=s'   => \$workdir,
     'no-update'     => \$no_update
 ) or pod2usage( 2 );
@@ -43 +43 @@
     and defined $classId 
     and defined $input
-    and defined $outpath
     and defined $camera;
 
@@ -54 +53 @@
 die "Can't find required tools.\n" if $missing_tools;
 
-# XXX old verion Output file name
-# XXX old version (drop) : my ($vol, $dir, $file) = File::Spec->splitpath( $input );
+unless (defined $workdir) {
+    my ($vol, $dir, $file) = File::Spec->splitpath( $input );
+    $workdir = $dir;
+}
 
 ### Output file name --- must match camera configuration!
 my $outputRoot =  $expTag . '.p2';
-$outputRoot = File::Spec->catpath( $outpath, $outputRoot );
+$outputRoot = File::Spec->catfile( $workdir, $outputRoot );
 $outputRoot = $ipprc->convert_filename_absolute($outputRoot);
 $input = $ipprc->convert_filename_absolute ( $input );