IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 27180


Ignore:
Timestamp:
Mar 3, 2010, 5:29:07 PM (16 years ago)
Author:
Paul Price
Message:

Using PS::IPP::Config->file_exists in favor of '-f'.

Location:
trunk/ippScripts/scripts
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippScripts/scripts/camera_exp.pl

    r27062 r27180  
    243243            &my_die("Unable to perform ppImage: $error_code", $cam_id, $error_code);
    244244        }
    245         &my_die("Unable to find expected output file: $jpeg1", $cam_id, $PS_EXIT_PROG_ERROR) unless -f $ipprc->file_resolve($jpeg1);
     245        &my_die("Unable to find expected output file: $jpeg1", $cam_id, $PS_EXIT_PROG_ERROR) unless $ipprc->file_exists($jpeg1);
    246246    }
    247247
    … …  
    258258            &my_die("Unable to perform ppImage: $error_code", $cam_id, $error_code);
    259259        }
    260         &my_die("Unable to find expected output file: $jpeg2", $cam_id, $PS_EXIT_PROG_ERROR) unless -f $ipprc->file_resolve($jpeg2);
     260        &my_die("Unable to find expected output file: $jpeg2", $cam_id, $PS_EXIT_PROG_ERROR) unless $ipprc->file_exists($jpeg2);
    261261    }
    262262
    … …  
    313313
    314314        if (!$quality) {
    315             &my_die("Unable to find expected output file: $fpaObjects", $cam_id, $PS_EXIT_PROG_ERROR) unless -f $ipprc->file_resolve($fpaObjects);
     315            &my_die("Unable to find expected output file: $fpaObjects", $cam_id, $PS_EXIT_PROG_ERROR) unless $ipprc->file_exists($fpaObjects);
    316316
    317317            foreach my $outMask (@outMasks) {
    318                 &my_die("Unable to find expected output file: $outMask", $cam_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outMask);
     318                &my_die("Unable to find expected output file: $outMask", $cam_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outMask);
    319319            }
    320320

  • trunk/ippScripts/scripts/chip_imfile.pl

    r27062 r27180  
    376376    if ($do_stats) {
    377377        my $outputStatsReal = $ipprc->file_resolve($outputStats);
    378         &my_die("Couldn't find expected output file: $outputStats", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
     378        &my_die("Couldn't find expected output file: $outputStats", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal);
    379379
    380380        # measure chip stats

  • trunk/ippScripts/scripts/detrend_correct_imfile.pl

    r24764 r27180  
    9696    }
    9797
    98     &my_die("Couldn't find expected output file: $outputImage", $det_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputImage);
     98    &my_die("Couldn't find expected output file: $outputImage", $det_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputImage);
    9999}
    100100

  • trunk/ippScripts/scripts/detrend_norm_apply.pl

    r26514 r27180  
    150150        &my_die("Unable to perform ppImage: $error_code", $det_id, $iter, $class_id, $error_code);
    151151    }
    152     &my_die("Can't find expected output file: $output",    $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($output);
    153     &my_die("Can't find expected output file: $b1name",    $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($b1name);
    154     &my_die("Can't find expected output file: $b2name",    $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($b2name);
     152    &my_die("Can't find expected output file: $output",    $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($output);
     153    &my_die("Can't find expected output file: $b1name",    $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($b1name);
     154    &my_die("Can't find expected output file: $b2name",    $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($b2name);
    155155
    156156    my $statsNameReal = $ipprc->file_resolve($statsName);
    157     &my_die("Can't find expected output file: $statsName", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $statsNameReal;
     157    &my_die("Can't find expected output file: $statsName", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($statsNameReal);
    158158
    159159    # parse stats from metadata

  • trunk/ippScripts/scripts/detrend_norm_exp.pl

    r24764 r27180  
    144144    ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
    145145        run(command => $command, verbose => $verbose);
    146     &my_die("Unable to find expected output file: $jpeg1Name", $det_id, $iter, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($jpeg1Name);
     146    &my_die("Unable to find expected output file: $jpeg1Name", $det_id, $iter, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($jpeg1Name);
    147147
    148148    # Make the jpeg for binning 2
    … …  
    153153    ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
    154154        run(command => $command, verbose => $verbose);
    155     &my_die("Unable to find expected output file: $jpeg2Name", $det_id, $iter, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($jpeg2Name);
     155    &my_die("Unable to find expected output file: $jpeg2Name", $det_id, $iter, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($jpeg2Name);
    156156
    157157}

  • trunk/ippScripts/scripts/detrend_process_exp.pl

    r24764 r27180  
    156156        &my_die("Unable to perform ppImage: $error_code", $det_id, $exp_id, $error_code);
    157157    }
    158     &my_die("Unable to find expected output file: $jpeg1", $det_id, $exp_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($jpeg1);
     158    &my_die("Unable to find expected output file: $jpeg1", $det_id, $exp_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($jpeg1);
    159159
    160160    # Make the jpeg for binning 2
    … …  
    169169        &my_die("Unable to perform ppImage: $error_code", $det_id, $exp_id, $error_code);
    170170    }
    171     &my_die("Unable to find expected output file: $jpeg2", $det_id, $exp_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($jpeg2);
     171    &my_die("Unable to find expected output file: $jpeg2", $det_id, $exp_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($jpeg2);
    172172}
    173173

  • trunk/ippScripts/scripts/detrend_process_imfile.pl

    r26514 r27180  
    9191                  'DOMEFLAT_RAW'     => 'PPIMAGE.OUTPUT.DETREND',
    9292                  'SKYFLAT_RAW'      => 'PPIMAGE.OUTPUT.DETREND',
    93                   'SKYFLATTEST_RAW'  => 'PPIMAGE.OUTPUT.DETREND',
     93                  'SKYFLATTEST_RAW'  => 'PPIMAGE.OUTPUT.DETREND',
    9494                  'FLAT'             => 'PPIMAGE.OUTPUT.DETREND',
    9595                  'DOMEFLAT'         => 'PPIMAGE.OUTPUT.DETREND',
    … …  
    139139    }
    140140
    141     &my_die("Couldn't find expected output file: $outputImage", $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputImage);
    142     &my_die("Couldn't find expected output file: $outputBin1",  $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputBin1);
    143     &my_die("Couldn't find expected output file: $outputBin2",  $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputBin2);
     141    &my_die("Couldn't find expected output file: $outputImage", $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputImage);
     142    &my_die("Couldn't find expected output file: $outputBin1",  $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin1);
     143    &my_die("Couldn't find expected output file: $outputBin2",  $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin2);
    144144
    145145    my $outputStatsReal = $ipprc->file_resolve($outputStats);
    146     &my_die("Couldn't find expected output file: $outputStats", $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
     146    &my_die("Couldn't find expected output file: $outputStats", $det_id, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal);
    147147
    148148    # parse stats from metadata

  • trunk/ippScripts/scripts/detrend_resid_exp.pl

    r24764 r27180  
    134134    foreach my $norm (@$normsMD) {
    135135        my $class_id = $norm->{class_id};
    136         my $normalization = 1.0 / $norm->{norm};
     136        my $normalization = 1.0 / $norm->{norm};
    137137
    138138        $norms{$class_id} = $normalization;
    … …  
    197197        # modify and save the data in this block:
    198198        foreach my $data (@$mdComponents) {
    199             my $norm = 1.0;
    200             if ($det_mode eq "master") {
    201                 $norm = $norms{$class_id};
    202             }
     199            my $norm = 1.0;
     200            if ($det_mode eq "master") {
     201                $norm = $norms{$class_id};
     202            }
    203203
    204204            # fields to modify by the normalization:
    … …  
    272272        &my_die("Unable to run ppImage: $error_code", $det_id, $iter, $exp_id, $error_code);
    273273    }
    274     &my_die("Unable to find expected output file: $jpeg1Name", $det_id, $iter, $exp_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($jpeg1Name);
     274    &my_die("Unable to find expected output file: $jpeg1Name", $det_id, $iter, $exp_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($jpeg1Name);
    275275
    276276    # Make the jpeg for binning 2
    … …  
    287287        &my_die("Unable to run ppImage: $error_code", $det_id, $iter, $exp_id, $error_code);
    288288    }
    289     &my_die("Unable to find expected output file: $jpeg2Name", $det_id, $iter, $exp_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($jpeg2Name);
     289    &my_die("Unable to find expected output file: $jpeg2Name", $det_id, $iter, $exp_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($jpeg2Name);
    290290}
    291291

  • trunk/ippScripts/scripts/detrend_resid_imfile.pl

    r26514 r27180  
    138138                  'DOMEFLAT_RAW'     => 'PPIMAGE.OUTPUT.DETREND',
    139139                  'SKYFLAT_RAW'      => 'PPIMAGE.OUTPUT.DETREND',
    140                   'SKYFLATTEST_RAW'  => 'PPIMAGE.OUTPUT.DETREND',
     140                  'SKYFLATTEST_RAW'  => 'PPIMAGE.OUTPUT.DETREND',
    141141                  'FLAT'             => 'PPIMAGE.OUTPUT.DETREND',
    142142                  'DOMEFLAT'         => 'PPIMAGE.OUTPUT.DETREND',
    … …  
    190190    }
    191191
    192     &my_die("Couldn't find expected output file: $outputName", $det_id, $iter, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputName);
    193     &my_die("Couldn't find expected output file: $bin1Name", $det_id, $iter, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($bin1Name);
    194     &my_die("Couldn't find expected output file: $bin2Name", $det_id, $iter, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($bin2Name);
     192    &my_die("Couldn't find expected output file: $outputName", $det_id, $iter, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName);
     193    &my_die("Couldn't find expected output file: $bin1Name", $det_id, $iter, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name);
     194    &my_die("Couldn't find expected output file: $bin2Name", $det_id, $iter, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name);
    195195
    196196    my $outputStatsReal = $ipprc->file_resolve($outputStats);
    197     &my_die("Couldn't find expected output file: $outputStats", $det_id, $iter, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
     197    &my_die("Couldn't find expected output file: $outputStats", $det_id, $iter, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal);
    198198
    199199    # ppStatsFromMetadata $outputStats - DETREND_RESID_IMFILE

  • trunk/ippScripts/scripts/detrend_stack.pl

    r26499 r27180  
    8989                  'DOMEFLAT_RAW'     => 'PPMERGE.OUTPUT.FLAT',
    9090                  'SKYFLAT_RAW'      => 'PPMERGE.OUTPUT.FLAT',
    91                   'SKYFLATTEST_RAW'  => 'PPMERGE.OUTPUT.FLAT',
     91                  'SKYFLATTEST_RAW'  => 'PPMERGE.OUTPUT.FLAT',
    9292                  'FLAT'             => 'PPMERGE.OUTPUT.FLAT',
    9393                  'DOMEFLAT'         => 'PPMERGE.OUTPUT.FLAT',
    … …  
    114114                   'DOMEFLAT_RAW'     => 'DETSTATS',
    115115                   'SKYFLAT_RAW'      => 'DETSTATS',
    116                    'SKYFLATTEST_RAW'  => 'DETSTATS',
     116                   'SKYFLATTEST_RAW'  => 'DETSTATS',
    117117                   'FLAT'             => 'DETSTATS',
    118118                   'DOMEFLAT'         => 'DETSTATS',
    … …  
    206206        &my_die("Unable to perform ppMerge: $error_code", $det_id, $iter, $class_id, $error_code);
    207207    }
    208     &my_die("Unable to find expected output file: $outputStack\n", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputStack);
    209     &my_die("Unable to find expected output file: $outputCount\n", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputCount);
    210     &my_die("Unable to find expected output file: $outputSigma\n", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outputSigma);
     208    &my_die("Unable to find expected output file: $outputStack\n", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStack);
     209    &my_die("Unable to find expected output file: $outputCount\n", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputCount);
     210    &my_die("Unable to find expected output file: $outputSigma\n", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSigma);
    211211
    212212    my $outputStatsReal = $ipprc->file_resolve($outputStats);
    213     &my_die("Couldn't find expected output file: $outputStats", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
     213    &my_die("Couldn't find expected output file: $outputStats", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal);
    214214
    215215    # parse stats from metadata

  • trunk/ippScripts/scripts/stack_skycell.pl

    r27130 r27180  
    261261    if ($do_stats) {
    262262        my $outputStatsReal = $ipprc->file_resolve($outputStats);
    263         &my_die("Couldn't find expected output file: $outputStats", $stack_id, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
     263        &my_die("Couldn't find expected output file: $outputStats", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal);
    264264
    265265        # measure stats

  • trunk/ippScripts/scripts/warp_skycell.pl

    r27062 r27180  
    263263        # Check first for the stats file
    264264        my $outputStatsReal = $ipprc->file_resolve($outputStats);
    265         &my_die("Couldn't find expected output file: $outputStats", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
     265        &my_die("Couldn't find expected output file: $outputStats", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal);
    266266        &my_die("Stats file has zero size: $outputStats", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless -s $outputStatsReal;
    267267
Note: See TracChangeset for help on using the changeset viewer.