Changeset 14093

Timestamp:

Jul 9, 2007, 4:36:42 PM (19 years ago)

Author:

eugene

Message:

adjusting output names, adding exp_id to addprocessedimfile, adding exp_tag to args

File:

• trunk/ippScripts/scripts/chip_imfile.pl (modified) (5 diffs)

trunk/ippScripts/scripts/chip_imfile.pl

@@ -33 +33 @@
 
 # Parse the command-line arguments
-my ($exp_id, $chip_id, $class_id, $input_uri, $camera, $dbname, $workdir, $reduction, $no_update, $no_op);
+my ($exp_id, $chip_id, $class_id, $input_uri, $exp_tag, $camera, $dbname, $workdir, $reduction, $no_update, $no_op);
 GetOptions(
            'exp_id=s'      => \$exp_id,    # Exposure identifier                       
@@ -41 +41 @@
            'camera|c=s'    => \$camera,    # Camera                            
            'dbname|d=s'    => \$dbname,    # Database name
+           'exp_tag=s'     => \$exp_tag,    # Exposure identifier                      
            'workdir|w=s'   => \$workdir,   # Working directory, for output files  
            'reduction=s'   => \$reduction, # Reduction class                   
@@ -48 +49 @@
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --exp_id --chip_id --class_id --uri --camera",
-           -exitval => 3) 
-    unless defined $exp_id
-    and defined $chip_id 
-    and defined $class_id 
-    and defined $input_uri
-    and defined $camera;
+pod2usage( -msg => "Required options: --exp_id --exp_tag --chip_id --class_id --uri --camera",
+           -exitval => 3) unless
+    defined $exp_id and
+    defined $chip_id and
+    defined $class_id and
+    defined $input_uri and
+    defined $exp_tag and
+    defined $camera;
 
 $ipprc->define_camera($camera);
@@ -93 +95 @@
 &my_die("Couldn't find input file: $input_uri\n", $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input_uri);
 
-$workdir = caturi( $workdir, $exp_id ) if defined $workdir;
-
-my $outputRoot  = $ipprc->file_prepare( "$exp_id.chp$chip_id", $workdir, $input_uri );
-
-my $outputImage = $ipprc->filename("PPIMAGE.CHIP",      $outputRoot, $class_id);
-my $outputMask  = $ipprc->filename("PPIMAGE.CHIP.MASK", $outputRoot, $class_id);
-my $outputBin1  = $ipprc->filename("PPIMAGE.BIN1",      $outputRoot, $class_id);
-my $outputBin2  = $ipprc->filename("PPIMAGE.BIN2",      $outputRoot, $class_id);
-my $outputStats = $ipprc->filename("PPIMAGE.STATS",     $outputRoot, $class_id);
+$workdir = caturi( $workdir, $exp_tag ) if defined $workdir;
+
+my $outputRoot  = $ipprc->file_prepare( "$exp_tag.ch.$chip_id", $workdir, $input_uri );
+
+my $outputImage = $ipprc->filename("PPIMAGE.CHIP",      $outputRoot, $class_id) or &my_die("Missing entry from camera config", $chip_id, $class_id, $PS_EXIT_PROG_ERROR);
+my $outputMask  = $ipprc->filename("PPIMAGE.CHIP.MASK", $outputRoot, $class_id) or &my_die("Missing entry from camera config", $chip_id, $class_id, $PS_EXIT_PROG_ERROR);
+my $outputBin1  = $ipprc->filename("PPIMAGE.BIN1",      $outputRoot, $class_id) or &my_die("Missing entry from camera config", $chip_id, $class_id, $PS_EXIT_PROG_ERROR);
+my $outputBin2  = $ipprc->filename("PPIMAGE.BIN2",      $outputRoot, $class_id) or &my_die("Missing entry from camera config", $chip_id, $class_id, $PS_EXIT_PROG_ERROR);
+my $outputStats = $ipprc->filename("PPIMAGE.STATS",     $outputRoot, $class_id) or &my_die("Missing entry from camera config", $chip_id, $class_id, $PS_EXIT_PROG_ERROR);
 
 # Run ppImage
@@ -146 +148 @@
 # command to update database
 my $command = "$chiptool -addprocessedimfile";
+$command .= " -exp_id $exp_id";
 $command .= " -chip_id $chip_id";
 $command .= " -class_id $class_id";