IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 11319


Ignore:
Timestamp:
Jan 26, 2007, 12:20:56 PM (19 years ago)
Author:
Paul Price
Message:

Fixing compilation errors.

Location:
trunk/ippScripts/scripts
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippScripts/scripts/detrend_norm_apply.pl

    r11316 r11319  
    9898        run(command => $command, verbose => 1);
    9999    unless ($success) {
    100         $error_code >> 8;
    101         &my_die("Unable to perform ppImage: $error_code", $det_id, $iter, $class_id, $error_code);
     100        $error_code = $error_code >> 8;
     101        &my_die("Unable to perform ppImage: $error_code", $detId, $iter, $classId, $error_code);
    102102    }
    103     &my_die("Can't find expected output file: $output", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -e $output;
    104     &my_die("Can't find expected output file: $b1name", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -e $b2name;
    105     &my_die("Can't find expected output file: $b2name", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -e $b1name;
    106     &my_die("Can't find expected output file: $statsName", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -e $statsName;
     103    &my_die("Can't find expected output file: $output", $detId, $iter, $classId, $PS_EXIT_SYS_ERROR) unless -e $output;
     104    &my_die("Can't find expected output file: $b1name", $detId, $iter, $classId, $PS_EXIT_SYS_ERROR) unless -e $b2name;
     105    &my_die("Can't find expected output file: $b2name", $detId, $iter, $classId, $PS_EXIT_SYS_ERROR) unless -e $b1name;
     106    &my_die("Can't find expected output file: $statsName", $detId, $iter, $classId, $PS_EXIT_SYS_ERROR) unless -e $statsName;
    107107}
    108108
    … …  
    111111{
    112112    my $statsFile;              # File handle
    113     open $statsFile, $statsName or &my_die("Can't open statistics file $statsName: $!\n", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR);
     113    open $statsFile, $statsName or &my_die("Can't open statistics file $statsName: $!\n", $detId, $iter, $classId, $PS_EXIT_SYS_ERROR);
    114114    my @contents = <$statsFile>; # Contents of file
    115115    close $statsFile;
    116116    my $mdcParser = PS::IPP::Metadata::Config->new;     # Parser for metadata config files
    117117    my $metadata = $mdcParser->parse(join "", @contents)
    118         or &my_die("Unable to parse metadata config", $det_id, $iter, $class_id, $PS_EXIT_PROG_ERROR);
     118        or &my_die("Unable to parse metadata config", $detId, $iter, $classId, $PS_EXIT_PROG_ERROR);
    119119    $stats = PS::IPP::Metadata::Stats->new(); # Stats parser
    120     $stats->parse($metadata) or &my_die("Unable to find all values in statistics output.", $det_id, $iter, $class_id, $PS_EXIT_PROG_ERROR);
     120    $stats->parse($metadata) or &my_die("Unable to find all values in statistics output.", $detId, $iter, $classId, $PS_EXIT_PROG_ERROR);
    121121}
    122122
    … …  
    143143        run(command => $command, verbose => 1);
    144144    unless ($success) {
    145         $error_code >> 8;
     145        $error_code = $error_code >> 8;
    146146        warn("Unable to perform dettool -addnormalizedimfile: $error_code\n");
    147147        exit($error_code);

  • trunk/ippScripts/scripts/detrend_norm_exp.pl

    r11316 r11319  
    88
    99use IPC::Cmd qw( can_run run );
    10 use PS::IPP::Metadata::Config qw(
     10use PS::IPP::Metadata::Config;
     11use PS::IPP::Metadata::List qw( parse_md_list );
     12use Statistics::Descriptive;
     13
     14use PS::IPP::Config qw(
    1115    $PS_EXIT_SUCCESS
    1216    $PS_EXIT_UNKNOWN_ERROR
    … …  
    1721    $PS_EXIT_TIMEOUT_ERROR
    1822    );
    19 use PS::IPP::Metadata::List qw( parse_md_list );
    20 use Statistics::Descriptive;
    21 
    22 use PS::IPP::Config;
    2323my $ipprc = PS::IPP::Config->new(); # IPP configuration
    2424use File::Spec;
    … …  
    7272        run(command => $command, verbose => 1);
    7373    unless ($success) {
    74         $error_code >> 8;
     74        $error_code = $error_code >> 8;
    7575        &my_die("Unable to perform ppImage: $error_code", $det_id, $iter, $error_code);
    7676    }
    … …  
    164164        run(command => $command, verbose => 1);
    165165    unless ($success) {
    166         $error_code >> 8;
     166        $error_code = $error_code >> 8;
    167167        &my_die("Unable to perform dettool -addnormalizedexp: $error_code", $det_id, $iter, $error_code);
    168168    }

  • trunk/ippScripts/scripts/detrend_process_exp.pl

    r11316 r11319  
    7070        run(command => $command, verbose => 1);
    7171    unless ($success) {
    72         $error_code >> 8;
     72        $error_code = $error_code >> 8;
    7373        &my_die("Unable to perform dettool -processedimfile: $error_code", $det_id, $exp_tag, $error_code);
    7474    }
    … …  
    8585    my @variances;    # Array of variances for each component
    8686    foreach my $file (@$files) {
    87         &my_die("Unable to find class id", $det_id, $exp_tag, $PS_EXIT_SYS_ERRROR) unless defined $file->{class_id};
     87        &my_die("Unable to find class id", $det_id, $exp_tag, $PS_EXIT_SYS_ERROR) unless defined $file->{class_id};
    8888        my $class_id = $file->{class_id};
    8989        &my_die("Unable to find bg for class_id=$class_id", $det_id, $exp_tag, $PS_EXIT_SYS_ERROR) unless defined $file->{bg};
    … …  
    141141        run(command => $command, verbose => 1);
    142142    unless ($success) {
    143         $error_code >> 8;
     143        $error_code = $error_code >> 8;
    144144        &my_die("Unable to perform ppImage: $error_code", $det_id, $exp_tag, $error_code);
    145145    }
    … …  
    153153        run(command => $command, verbose => 1);
    154154    unless ($success) {
    155         $error_code >> 8;
     155        $error_code = $error_code >> 8;
    156156        &my_die("Unable to perform ppImage: $error_code", $det_id, $exp_tag, $error_code);
    157157    }
    … …  
    172172        run(command => $command, verbose => 1);
    173173    unless ($success) {
    174         $error_code >> 8;
     174        $error_code = $error_code >> 8;
    175175        warn("Unable to perform dettool -addprocessedexp: $error_code");
    176176        exit($error_code);

  • trunk/ippScripts/scripts/detrend_process_imfile.pl

    r11316 r11319  
    2626use Pod::Usage qw( pod2usage );
    2727
    28 my ($det_id, $exp_tag, $class_id, $det_type, $input_uri, $camera, $bdname, $workdir, $no_update);
     28my ($det_id, $exp_tag, $class_id, $det_type, $input_uri, $camera, $dbname, $workdir, $no_update);
    2929GetOptions(
    3030    'det_id|d=s'        => \$det_id,
    … …  
    103103        run(command => $command, verbose => 1);
    104104    unless ($success) {
    105         $error_code >> 8;
     105        $error_code = $error_code >> 8;
    106106        &my_die("Unable to perform ppImage: $error_code", $det_id, $exp_tag, $class_id, $error_code);
    107107    }
    … …  
    149149        run(command => $command, verbose => 1);
    150150    unless ($success) {
    151         $error_code >> 8;
     151        $error_code = $error_code >> 8;
    152152        warn("Unable to perform dettool -addprocessedimfile: $error_code\n");
    153153        exit($error_code);

  • trunk/ippScripts/scripts/detrend_reject_exp.pl

    r11316 r11319  
    6565        run(command => $command, verbose => 1);
    6666    unless ($success) {
    67         $error_code >> 8;
     67        $error_code = $error_code >> 8;
    6868        &my_die("Unable to perform dettool -residexp: $error_code", $det_id, $iter, $error_code);
    6969    }
    … …  
    188188            run(command => $command, verbose => 1);
    189189        unless ($success) {
    190             $error_code >> 8;
     190            $error_code = $error_code >> 8;
    191191            &my_die("Unable to perform dettool -updateresidexp: $error_code", $det_id, $iter, $error_code);
    192192        }
    … …  
    226226        run(command => $command, verbose => 1);
    227227    unless ($success) {
    228         $error_code >> 8;
     228        $error_code = $error_code >> 8;
    229229        warn("Unable to perform dettool -adddetrunsummary: $error_code");
    230230        exit($error_code);
    … …  
    246246        run(command => $command, verbose => 1);
    247247    unless ($success) {
    248         $error_code >> 8;
     248        $error_code = $error_code >> 8;
    249249        warn("Unable to perform dettool -updatedetrun: $error_code");
    250250        exit($error_code);

  • trunk/ippScripts/scripts/detrend_reject_imfile.pl

    r11316 r11319  
    3535           'camera=s'          => \$camera,
    3636           'filter=s'          => \$filter,
    37            'reject'            => \$reject
     37           'reject'            => \$reject,
    3838           'dbname|d=s'        => \$dbname, # Database name
    3939           'workdir|w=s'       => \$workdir, # Working directory, for output files
    … …  
    7575        run(command => $command, verbose => 1);
    7676    unless ($success) {
    77         $error_code >> 8;
     77        $error_code = $error_code >> 8;
    7878        warn("Unable to perform dettool -residimfile: $error_code\n");
    7979        exit($error_code);
    … …  
    125125        run(command => $command, verbose => 1);
    126126    unless ($success) {
    127         $error_code >> 8;
     127        $error_code = $error_code >> 8;
    128128        &my_die("Unable to run ppImage: $error_code", $det_id, $iter, $exp_tag, $error_code);
    129129    }
    … …  
    137137        run(command => $command, verbose => 1);
    138138    unless ($success) {
    139         $error_code >> 8;
     139        $error_code = $error_code >> 8;
    140140        &my_die("Unable to run ppImage: $error_code", $det_id, $iter, $exp_tag, $error_code);
    141141    }
    … …  
    274274        run(command => $command, verbose => 1);
    275275    unless ($success) {
    276         $error_code >> 8;
     276        $error_code = $error_code >> 8;
    277277        warn("Unable to perform dettool -addresidexp: $error_code\n");
    278278        exit($error_code);
    … …  
    300300
    301301    warn($msg);
    302     if ($det_id and $iteration and $exp_tag) {
     302    if ($det_id and $iter and $exp_tag) {
    303303        my $command = "$dettool -addresidexp -det_id $det_id -iteration $iter -exp_tag $exp_tag -code $exit_code";
    304304        $command .= " -dbname $dbname" if defined $dbname;

  • trunk/ippScripts/scripts/detrend_resid.pl

    r11316 r11319  
    142142        run(command => $command, verbose => 1);
    143143    unless ($success) {
    144         $error_code >> 8;
     144        $error_code = $error_code >> 8;
    145145        &my_die("Unable to perform ppImage: $error_code", $det_id, $iter, $exp_tag, $class_id, $error_code);
    146146    }
    … …  
    188188        run(command => $command, verbose => 1);
    189189    unless ($success) {
    190         $error_code >> 8;
     190        $error_code = $error_code >> 8;
    191191        warn("Unable to perform dettool -addresidimfile: $error_code\n");
    192192        exit($error_code);

  • trunk/ippScripts/scripts/detrend_stack.pl

    r11316 r11319  
    8282        run(command => $command, verbose => 1);
    8383    unless ($success) {
    84         $error_code >> 8;
     84        $error_code = $error_code >> 8;
    8585        &my_die("Unable to perform dettool -processedimfile: $error_code", $det_id, $iter, $class_id, $error_code);
    8686    }
    … …  
    117117        run(command => $command, verbose => 1);
    118118    unless ($success) {
    119         $error_code >> 8;
     119        $error_code = $error_code >> 8;
    120120        &my_die("Unable to perform ppMerge: $error_code", $det_id, $iter, $class_id, $error_code);
    121121    }
    … …  
    157157        run(command => $command, verbose => 1);
    158158    unless ($success) {
    159         $error_code >> 8;
     159        $error_code = $error_code >> 8;
    160160        warn("Unable to perform dettool -addstacked: $error_code\n");
    161161        exit($error_code);

  • trunk/ippScripts/scripts/phase0_exp.pl

    r11297 r11319  
    2525    );
    2626
    27 my ($cache, $exptag, $no_update);
     27my ($cache, $exptag, $dbname, $no_update);
    2828
    2929GetOptions(

  • trunk/ippScripts/scripts/phase2.pl

    r11316 r11319  
    2626
    2727# Parse the command-line arguments
    28 my ($expTag,                    # Exposure tag
    29     $classId,                   # Class Id
     28my ($exp_tag,                   # Exposure tag
     29    $class_id,                  # Class Id
    3030    $input,                     # Input FITS file
    3131    $camera,                    # Camera
    … …  
    3535    );
    3636GetOptions(
    37     'exp_tag|e=s'   => \$expTag,
    38     'class_id|i=s'  => \$classId,
     37    'exp_tag|e=s'   => \$exp_tag,
     38    'class_id|i=s'  => \$class_id,
    3939    'uri|u=s'       => \$input,
    4040    'camera|c=s'    => \$camera,
    … …  
    4646pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
    4747pod2usage(
    48     -msg => "Required options: --exp_tag --class_id --uri --camera --outpath",
     48    -msg => "Required options: --exp_tag --class_id --uri --camera --workdir",
    4949    -exitval => 3,
    50 ) unless defined $expTag
    51     and defined $classId
     50) unless defined $exp_tag
     51    and defined $class_id
    5252    and defined $input
    5353    and defined $camera;
    … …  
    7070
    7171### Output file name --- must match camera configuration!
    72 my $outputRoot =  $expTag . '.p2';
     72my $outputRoot =  $exp_tag . '.p2';
    7373$outputRoot = File::Spec->catfile( $workdir, $outputRoot );
    7474$outputRoot = $ipprc->convert_filename_absolute($outputRoot);
    7575$input = $ipprc->convert_filename_absolute ( $input );
    7676
    77 my $outputImage = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $classId);
    78 my $outputBin1 = $ipprc->filename("PPIMAGE.BIN1", $outputRoot, $classId);
    79 my $outputBin2 = $ipprc->filename("PPIMAGE.BIN2", $outputRoot, $classId);
    80 my $outputStats = $outputRoot  . '.' . $classId . '.stats';
     77my $outputImage = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $class_id);
     78my $outputBin1 = $ipprc->filename("PPIMAGE.BIN1", $outputRoot, $class_id);
     79my $outputBin2 = $ipprc->filename("PPIMAGE.BIN2", $outputRoot, $class_id);
     80my $outputStats = $outputRoot  . '.' . $class_id . '.stats';
    8181
    8282# Run ppImage
    … …  
    9191        run(command => $command, verbose => 1);
    9292    unless ($success) {
    93         $error_code >> 8;
     93        $error_code = $error_code >> 8;
    9494        &my_die("Unable to perform ppImage: $error_code", $exp_tag, $class_id, $error_code);
    9595    }
    … …  
    122122    # Command to run p2tool
    123123    my $command = "$p2tool -addprocessedimfile";
    124     $command .= " -exp_tag $expTag";
    125     $command .= " -class_id $classId";
     124    $command .= " -exp_tag $exp_tag";
     125    $command .= " -class_id $class_id";
    126126    $command .= " -recip " . RECIPE;
    127127    $command .= " -uri $outputImage";
    … …  
    136136        run(command => $command, verbose => 1);
    137137    unless ($success) {
    138         $error_code >> 8;
     138        $error_code = $error_code >> 8;
    139139        warn("Unable to perform p2tool -addprocessedimfile: $error_code\n");
    140140        exit($error_code);
    … …  
    154154    warn($msg);
    155155    if ($exp_tag and $class_id) {
    156         my $command = "$dettool -addprocessedimfile -exp_tag $exp_tag -class_id $class_id -code $exit_code";
     156        my $command = "$p2tool -addprocessedimfile -exp_tag $exp_tag -class_id $class_id -code $exit_code";
    157157        $command .= " -dbname $dbname" if defined $dbname;
    158158        system ($command);

  • trunk/ippScripts/scripts/phase3.pl

    r11316 r11319  
    2727use Pod::Usage qw( pod2usage );
    2828
    29 my ($exp_tag, $camera, $outpath, $dbname, $workdir, $no_update);
     29my ($exp_tag, $camera, $dbname, $workdir, $no_update);
    3030GetOptions(
    3131    'exp_tag|e=s'       => \$exp_tag,
    … …  
    3838pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
    3939pod2usage(
    40     -msg => "Required options: --exp_tag --camera --outpath",
     40    -msg => "Required options: --exp_tag --camera --workdir",
    4141    -exitval => 3,
    4242) unless defined $exp_tag
    … …  
    6868        run(command => $command, verbose => 1);
    6969    unless ($success) {
    70         $error_code >> 8;
     70        $error_code = $error_code >> 8;
    7171        &my_die("Unable to perform p3tool: $error_code", $exp_tag, $error_code);
    7272    }
    … …  
    148148        run(command => $command, verbose => 1);
    149149    unless ($success) {
    150         $error_code >> 8;
     150        $error_code = $error_code >> 8;
    151151        &my_die("Unable to perform ppImage: $error_code", $exp_tag, $error_code);
    152152    }
    … …  
    160160        run(command => $command, verbose => 1);
    161161    unless ($success) {
    162         $error_code >> 8;
     162        $error_code = $error_code >> 8;
    163163        &my_die("Unable to perform ppImage: $error_code", $exp_tag, $error_code);
    164164    }
    … …  
    180180        run(command => $command, verbose => 1);
    181181    unless ($success) {
    182         $error_code >> 8;
     182        $error_code = $error_code >> 8;
    183183        warn("Unable to perform dettool -addprocessedexp: $error_code\n");
    184184        exit($error_code);
    … …  
    198198    warn($msg);
    199199    if ($exp_tag) {
    200         my $command = "$dettool -addprocessedexp -exp_tag $exp_tag -code $exit_code";
     200        my $command = "$p3tool -addprocessedexp -exp_tag $exp_tag -code $exit_code";
    201201        $command .= " -dbname $dbname" if defined $dbname;
    202202        system ($command);
Note: See TracChangeset for help on using the changeset viewer.