Changeset 16746

Timestamp:

Feb 28, 2008, 4:35:57 PM (18 years ago)

Author:

Paul Price

Message:

Using --outroot instead of --workdir.

Location:

trunk/ippScripts/scripts

Files:

• ipp_serial_diff.pl (modified) (1 diff)
• ipp_serial_stack.pl (modified) (3 diffs)
• ipp_serial_warp.pl (modified) (4 diffs)

trunk/ippScripts/scripts/ipp_serial_diff.pl

@@ -78 +78 @@
         die "No working directory specified.\n" unless defined $workdir;
         
-        my $outroot = caturi( $workdir, "tess_$tess_id", $skycell_id, "$tess_id.$skycell_id.diff.$diff_id" );
+        my $outroot = caturi( $workdir, "tess_$tess_id", $skycell_id, "$tess_id.$skycell_id.dif.$diff_id" );
 
         my $command = "$diff_skycell --diff_id $diff_id --dbname $dbname --outroot $outroot";

trunk/ippScripts/scripts/ipp_serial_stack.pl

@@ -27 +27 @@
 my ($dbname,                    # Database name to use
     $verbose,                   # Verbose operations?
+    $workdir_global,            # Global working directory
     $no_op,                     # No operations?
     $no_update,                 # No updating?
@@ -34 +35 @@
            'dbname=s' => \$dbname,
            'verbose' => \$verbose,
+           'workdir' => \$workdir_global,
            'no-op' => \$no_op,
            'no-update' => \$no_update,
@@ -75 +77 @@
         my $workdir = $item->{workdir};
         
-        my $command = "$stack_skycell --stack_id $stack_id --dbname $dbname";
+        $workdir = $workdir_global unless defined $workdir and $workdir ne "NULL";
+        die "No working directory specified.\n" unless defined $workdir;
+        
+        my $outroot = caturi( $workdir, "tess_$tess_id", $skycell_id, "$tess_id.$skycell_id.stk.$stack_id" );
+
+        my $command = "$stack_skycell --stack_id $stack_id --dbname $dbname --outroot $outroot";
         $command .= " --verbose" if defined $verbose;
         $command .= " --no-op" if defined $no_op;
         $command .= " --no-update" if defined $no_update;
         $command .= " --save-temps" if defined $save_temps;
-        $command .= " --workdir $workdir" if defined $workdir;
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run( command => $command, verbose => 1 );

trunk/ippScripts/scripts/ipp_serial_warp.pl

@@ -27 +27 @@
 my ($dbname,                    # Database name to use
     $verbose,                   # Verbose operations?
+    $workdir_global,            # Global working directory
     $no_op,                     # No operations?
     $no_update,                 # No updating?
@@ -33 +34 @@
            'dbname=s' => \$dbname,
            'verbose' => \$verbose,
+           'workdir' => \$workdir_global,
            'no-op' => \$no_op,
            'no-update' => \$no_update,
@@ -82 +84 @@
         $command .= " --no-op" if defined $no_op;
         $command .= " --no-update" if defined $no_update;
-        $command .= " --workdir $workdir" if defined $workdir;
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run( command => $command, verbose => 1 );
@@ -108 +109 @@
         my $camera = $item->{camera};
         
-        my $command = "$warp_skycell --warp_id $warp_id --skycell_id $skycell_id --tess_id $tess_id --camera $camera --dbname $dbname";
+        $workdir = $workdir_global unless defined $workdir and $workdir ne "NULL";
+        die "No working directory specified.\n" unless defined $workdir;
+        
+        my $outroot = caturi( $workdir, "tess_$tess_id", $skycell_id, "$tess_id.$skycell_id.wrp.$warp_id" );
+
+        my $command = "$warp_skycell --warp_id $warp_id --skycell_id $skycell_id --tess_id $tess_id --camera $camera --dbname $dbname --outroot $outroot";
         $command .= " --verbose" if defined $verbose;
         $command .= " --no-op" if defined $no_op;
         $command .= " --no-update" if defined $no_update;
-        $command .= " --workdir $workdir" if defined $workdir and $workdir ne "NULL";
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run( command => $command, verbose => 1 );