IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 14222


Ignore:
Timestamp:
Jul 15, 2007, 1:52:01 PM (19 years ago)
Author:
eugene
Message:

fixing the fault ippTool call

Location:
trunk/ippScripts/scripts
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippScripts/scripts/camera_exp.pl

    r14158 r14222  
    270270    carp($msg);
    271271    if ($cam_id and not $no_update) {
    272         my $command = "$camtool -addprocessedexp -cam_id $cam_id -code $exit_code";
     272        my $command = "$camtool -addprocessedexp -cam_id $cam_id -uri UNKNOWN -code $exit_code";
    273273        $command .= " -dbname $dbname" if defined $dbname;
    274274        system ($command);

  • trunk/ippScripts/scripts/chip_imfile.pl

    r14159 r14222  
    6464my $recipe = $ipprc->reduction($reduction, 'CHIP'); # Recipe to use
    6565unless ($recipe) {
    66     &my_die("Couldn't find selected reduction for CHIP: $reduction\n", $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
     66    &my_die("Couldn't find selected reduction for CHIP: $reduction\n", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    6767}
    6868
    … …  
    9797}
    9898
    99 &my_die("Couldn't find input file: $input_uri\n", $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input_uri);
     99&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);
    100100
    101101$workdir = caturi( $workdir, $exp_tag ) if defined $workdir;
    … …  
    103103my $outputRoot  = $ipprc->file_prepare( "$exp_tag.ch.$chip_id", $workdir, $input_uri );
    104104
    105 my $outputImage = $ipprc->filename("PPIMAGE.CHIP",      $outputRoot, $class_id) or &my_die("Missing entry from camera config", $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    106 my $outputMask  = $ipprc->filename("PPIMAGE.CHIP.MASK", $outputRoot, $class_id) or &my_die("Missing entry from camera config", $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    107 my $outputBin1  = $ipprc->filename("PPIMAGE.BIN1",      $outputRoot, $class_id) or &my_die("Missing entry from camera config", $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    108 my $outputBin2  = $ipprc->filename("PPIMAGE.BIN2",      $outputRoot, $class_id) or &my_die("Missing entry from camera config", $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    109 my $outputStats = $ipprc->filename("PPIMAGE.STATS",     $outputRoot, $class_id) or &my_die("Missing entry from camera config", $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
     105my $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);
     106my $outputMask  = $ipprc->filename("PPIMAGE.CHIP.MASK", $outputRoot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
     107my $outputBin1  = $ipprc->filename("PPIMAGE.BIN1",      $outputRoot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
     108my $outputBin2  = $ipprc->filename("PPIMAGE.BIN2",      $outputRoot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
     109my $outputStats = $ipprc->filename("PPIMAGE.STATS",     $outputRoot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    110110
    111111# Run ppImage
    … …  
    121121    unless ($success) {
    122122        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
    123         &my_die("Unable to perform ppImage: $error_code", $chip_id, $class_id, $error_code);
    124     }
    125 
    126     &my_die("Couldn't find expected output file: $outputImage\n", $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputImage);
    127     &my_die("Couldn't find expected output file: $outputMask\n",  $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
    128     &my_die("Couldn't find expected output file: $outputBin1\n",  $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin1);
    129     &my_die("Couldn't find expected output file: $outputBin2\n",  $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin2);
    130     &my_die("Couldn't find expected output file: $outputStats\n", $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStats);
     123        &my_die("Unable to perform ppImage: $error_code", $exp_id, $chip_id, $class_id, $error_code);
     124    }
     125
     126    &my_die("Couldn't find expected output file: $outputImage\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputImage);
     127    &my_die("Couldn't find expected output file: $outputMask\n",  $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
     128    &my_die("Couldn't find expected output file: $outputBin1\n",  $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin1);
     129    &my_die("Couldn't find expected output file: $outputBin2\n",  $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin2);
     130    &my_die("Couldn't find expected output file: $outputStats\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStats);
    131131
    132132    # Get the statistics on the processed image
    133133    my $statsFile;              # File handle
    134     open $statsFile, $ipprc->file_resolve($outputStats) or &my_die("Can't open statistics file $outputStats: $!", $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
     134    open $statsFile, $ipprc->file_resolve($outputStats) or &my_die("Can't open statistics file $outputStats: $!", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
    135135    my @contents = <$statsFile>; # Contents of file
    136136    close $statsFile;
    … …  
    140140    my $metadata = $mdcParser->parse(join "", @contents);
    141141    unless ($metadata) {
    142         &my_die("Unable to parse metadata config doc", $chip_id, $class_id, $PS_EXIT_PROG_ERROR);
     142        &my_die("Unable to parse metadata config doc", $exp_id, $chip_id, $class_id, $PS_EXIT_PROG_ERROR);
    143143    }
    144144
    145145    # extract the stats from the metadata
    146146    unless ($stats->parse($metadata)) {
    147         &my_die("Failure extracting metadata from the statistics output file.\n", $chip_id, $class_id, $PS_EXIT_PROG_ERROR);
     147        &my_die("Failure extracting metadata from the statistics output file.\n", $exp_id, $chip_id, $class_id, $PS_EXIT_PROG_ERROR);
    148148    }
    149149}
    … …  
    175175{
    176176    my $msg = shift; # Warning message on die
     177    my $exp_id = shift; # Chiptool identifier
    177178    my $chip_id = shift; # Chiptool identifier
    178179    my $class_id = shift; # Class identifier
    … …  
    182183    if ($chip_id and $class_id and not $no_update) {
    183184        my $command = "$chiptool -addprocessedimfile";
     185        $command .= " -exp_id $exp_id";
    184186        $command .= " -chip_id $chip_id";
    185187        $command .= " -class_id $class_id";
Note: See TracChangeset for help on using the changeset viewer.