Changeset 24235

Timestamp:

May 21, 2009, 11:57:57 AM (17 years ago)

Author:

Paul Price

Message:

chip_imfile.pl also needs --chip_imfile_id

Location:

trunk/ippScripts/scripts

Files:

• chip_imfile.pl (modified) (3 diffs)
• ipp_serial_chip.pl (modified) (2 diffs)

trunk/ippScripts/scripts/chip_imfile.pl

@@ -52 +52 @@
     'run-state=s'       => \$run_state, # current state of the run (new, update)
     'magicked'          => \$magicked,  # magicked state of input file
-    'deburned=s'        => \$deburned,  # does deburned image exist? 
+    'deburned=s'        => \$deburned,  # does deburned image exist?
     'threads=s'         => \$threads,   # Number of threads to use for ppImage
     'verbose'           => \$verbose,   # Print to stdout
@@ -61 +61 @@
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --exp_id --chip_id --class_id --uri --camera --outroot --run-state",
+pod2usage( -msg => "Required options: --exp_id --chip_id --chip_imfile_id --class_id --uri --camera --outroot --run-state",
            -exitval => 3) unless
     defined $exp_id and
@@ -142 +142 @@
     my $useDeburnedImage = metadataLookupBool($recipeData, 'USE.DEBURNED.IMAGE');
     if ($useDeburnedImage && $deburned) {
-        $uri =~ s/fits$/burn.fits/;
-        &my_die("Couldn't find deburned input file: $uri\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($uri);
+        $uri =~ s/fits$/burn.fits/;
+        &my_die("Couldn't find deburned input file: $uri\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($uri);
     }
 

trunk/ippScripts/scripts/ipp_serial_chip.pl

@@ -68 +68 @@
             my $exp_id = $item->{exp_id};
             my $exp_tag = $item->{exp_tag};
+            my $chip_imfile_id = $item->{chip_imfile_id};
             my $camera = $item->{camera};
             my $class_id = $item->{class_id};
@@ -79 +80 @@
             $ipprc->outroot_prepare( $outroot );
 
-            my $command = "$chip --chip_id $chip_id --exp_id $exp_id --class_id $class_id --uri $uri --dbname $dbname --camera $camera --outroot $outroot --run-state $state";
+            my $command = "$chip --chip_id $chip_id --chip_imfile_id $chip_imfile_id --exp_id $exp_id --class_id $class_id --uri $uri --dbname $dbname --camera $camera --outroot $outroot --run-state $state";
             $command .= " --reduction $reduction" if defined $reduction;
             $command .= " --verbose" if defined $verbose;