IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 23653


Ignore:
Timestamp:
Apr 1, 2009, 9:47:29 AM (17 years ago)
Author:
Paul Price
Message:

Don't check for files to exist in the event that the quality is flagged as bad.

Location:
branches/pap/ippScripts/scripts
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/pap/ippScripts/scripts/camera_exp.pl

    r23532 r23653  
    263263            &my_die("Unable to perform psastro: $error_code", $cam_id, $error_code);
    264264        }
    265         # XXX do we want to give an error if astrometry fails here?
    266         &my_die("Unable to find expected output file: $fpaObjects", $cam_id, $PS_EXIT_PROG_ERROR) unless -f $ipprc->file_resolve($fpaObjects);
    267 
     265
     266        my $quality;            # Quality flag
    268267        if ($do_stats) {
    269268            my $fpaStatsReal = $ipprc->file_resolve($fpaStats);
    … …  
    282281            }
    283282            chomp $cmdflags;
     283
     284            ($quality) = $cmdflags =~ /-quality (\d+)/;
     285        }
     286
     287        if (!$quality) {
     288            &my_die("Unable to find expected output file: $fpaObjects", $cam_id, $PS_EXIT_PROG_ERROR) unless -f $ipprc->file_resolve($fpaObjects);
    284289        }
    285290

  • branches/pap/ippScripts/scripts/chip_imfile.pl

    r23532 r23653  
    171171    ## allow the output images to be optional, depending on the recipe / reduction class
    172172    my $outputImageExpect = metadataLookupBool($recipeData, 'CHIP.FITS');
    173     if ($outputImageExpect) {
    174         &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);
    175     }
    176 
    177173    my $outputMaskExpect = metadataLookupBool($recipeData, 'CHIP.MASK.FITS');
    178     if ($outputMaskExpect) {
    179         &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);
    180     }
    181 
    182174    my $outputWeightExpect = metadataLookupBool($recipeData, 'CHIP.VARIANCE.FITS');
    183     if ($outputWeightExpect) {
    184         &my_die("Couldn't find expected output file: $outputWeight\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight);
    185     }
    186 
    187     &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);
    188     &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);
    189 
     175
     176    my $quality;                # Quality flag
    190177    if ($do_stats) {
    191178        my $outputStatsReal = $ipprc->file_resolve($outputStats);
    … …  
    204191        }
    205192        chomp $cmdflags;
    206     }
     193        ($quality) = $cmdflags =~ /-quality (\d+)/; # Quality flag
     194    }
     195
     196    if (!$quality) {
     197        &my_die("Couldn't find expected output file: $outputImage\n",  $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless !$outputImageExpect or $ipprc->file_exists($outputImage);
     198        &my_die("Couldn't find expected output file: $outputMask\n",   $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless !$outputMaskExpect or $ipprc->file_exists($outputMask);
     199        &my_die("Couldn't find expected output file: $outputWeight\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless !$outputWeightExpect or $ipprc->file_exists($outputWeight);
     200        &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);
     201        &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);
     202    }
     203
    207204}
    208205

  • branches/pap/ippScripts/scripts/diff_skycell.pl

    r23532 r23653  
    248248        &my_die("Unable to perform ppSub: $error_code", $diff_id, $skycell_id, $error_code);
    249249    }
    250     &my_die("Couldn't find expected output file: $outputName", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName);
    251     &my_die("Couldn't find expected output file: $outputMask", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
    252     &my_die("Couldn't find expected output file: $outputVariance", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputVariance);
    253 #    &my_die("Couldn't find expected output file: $outputSources", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
    254 #    &my_die("Couldn't find expected output file: $bin1Name",    $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name);
    255 #    &my_die("Couldn't find expected output file: $bin2Name",    $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name);
    256250
    257251    my $outputStatsReal = $ipprc->file_resolve($outputStats);
    … …  
    270264    }
    271265    chomp $cmdflags;
     266
     267    my ($quality) = $cmdflags =~ /-quality (\d+)/; # Quality flag
     268
     269    if (!$quality) {
     270        &my_die("Couldn't find expected output file: $outputName", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName);
     271        &my_die("Couldn't find expected output file: $outputMask", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
     272        &my_die("Couldn't find expected output file: $outputVariance", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputVariance);
     273#        &my_die("Couldn't find expected output file: $outputSources", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
     274#        &my_die("Couldn't find expected output file: $bin1Name",    $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name);
     275#        &my_die("Couldn't find expected output file: $bin2Name",    $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name);
     276    }
    272277}
    273278

  • branches/pap/ippScripts/scripts/stack_skycell.pl

    r23532 r23653  
    232232        &my_die("Unable to perform ppStack: $error_code", $stack_id, $error_code);
    233233    }
    234     &my_die("Couldn't find expected output file: $outputName", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName);
    235     &my_die("Couldn't find expected output file: $outputMask", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
    236     &my_die("Couldn't find expected output file: $outputWeight", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight);
    237     &my_die("Couldn't find expected output file: $outputSources", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
    238 #   &my_die("Couldn't find expected output file: $bin1Name",    $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name);
    239 #   &my_die("Couldn't find expected output file: $bin2Name",    $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name);
    240 
     234
     235    my $quality;                # Quality flag
    241236    if ($do_stats) {
    242237        my $outputStatsReal = $ipprc->file_resolve($outputStats);
    … …  
    255250        }
    256251        chomp $cmdflags;
    257     }
     252
     253        ($quality) = $cmdflags =~ /-quality (\d+)/; # Quality flag
     254    }
     255
     256    if (!$quality) {
     257        &my_die("Couldn't find expected output file: $outputName", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName);
     258        &my_die("Couldn't find expected output file: $outputMask", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
     259        &my_die("Couldn't find expected output file: $outputWeight", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight);
     260        &my_die("Couldn't find expected output file: $outputSources", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
     261#       &my_die("Couldn't find expected output file: $bin1Name",    $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name);
     262#       &my_die("Couldn't find expected output file: $bin2Name",    $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name);
     263    }
     264
    258265}
    259266

  • branches/pap/ippScripts/scripts/warp_skycell.pl

    r23532 r23653  
    232232        chomp $cmdflags;
    233233
    234         if ($cmdflags =~ /-accept/) {
     234        my ($quality) = $cmdflags =~ /-quality (\d+)/; # Quality flag
     235
     236        if (!$quality and $cmdflags =~ /-accept/) {
    235237            &my_die("Couldn't find expected output file: $outputImage", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputImage);
    236238            &my_die("Couldn't find expected output file: $outputMask", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
Note: See TracChangeset for help on using the changeset viewer.