Changeset 14406

Timestamp:

Aug 6, 2007, 11:00:58 AM (19 years ago)

Author:

Paul Price

Message:

Changing input_uri to uri to match common usage.

Location:

trunk

Files:

• ippScripts/scripts/chip_imfile.pl (modified) (4 diffs)
• ippTasks/chip.pro (modified) (1 diff)

trunk/ippScripts/scripts/chip_imfile.pl

@@ -38 +38 @@
            'chip_id=s'     => \$chip_id,   # Chiptool identifier                       
            'class_id=s'    => \$class_id,  # Class identifier                  
-           'input_uri|u=s' => \$input_uri, # Input FITS file                   
+           'uri|u=s'       => \$uri,       # Input FITS file                   
            'camera|c=s'    => \$camera,    # Camera                            
            'dbname|d=s'    => \$dbname,    # Database name
@@ -54 +54 @@
     defined $chip_id and
     defined $class_id and
-    defined $input_uri and
+    defined $uri and
     defined $exp_tag and
     defined $camera;
@@ -97 +97 @@
 }
 
-&my_die("Couldn't find input file: $input_uri\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input_uri);
+&my_die("Couldn't find input file: $uri\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($uri);
 
 $workdir = caturi( $workdir, $exp_tag ) if defined $workdir;
 
-my $outputRoot  = $ipprc->file_prepare( "$exp_tag.ch.$chip_id", $workdir, $input_uri );
+my $outputRoot  = $ipprc->file_prepare( "$exp_tag.ch.$chip_id", $workdir, $uri );
 
 my $outputImage = $ipprc->filename("PPIMAGE.CHIP",      $outputRoot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
@@ -112 +112 @@
 # Run ppImage
 unless ($no_op) {
-    my $command = "$ppImage -file $input_uri $outputRoot";
+    my $command = "$ppImage -file $uri $outputRoot";
     $command .= " -recipe PPIMAGE $recipe";
     $command .= " -recipe PPSTATS CHIPSTATS";

trunk/ippTasks/chip.pro

@@ -152 +152 @@
     exec mkdir -p $outpath
 
-    $run = chip_imfile.pl --exp_id $EXP_ID --chip_id $CHIP_ID --class_id $CLASS_ID --exp_tag $EXP_TAG --input_uri $URI --camera $CAMERA
+    $run = chip_imfile.pl --exp_id $EXP_ID --chip_id $CHIP_ID --class_id $CLASS_ID --exp_tag $EXP_TAG --uri $URI --camera $CAMERA
     if ("$WORKDIR" != "NULL")
       $run = $run --workdir $WORKDIR