IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 21228


Ignore:
Timestamp:
Jan 29, 2009, 3:06:42 PM (17 years ago)
Author:
Paul Price
Message:

Convering 'weight' to 'variance' where appropriate.

Location:
branches/pap_branch_20090128/ippScripts/scripts
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/pap_branch_20090128/ippScripts/scripts/chip_imfile.pl

    r20927 r21228  
    108108my $outputImage   = $ipprc->filename("PPIMAGE.CHIP",        $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    109109my $outputMask    = $ipprc->filename("PPIMAGE.CHIP.MASK",   $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    110 my $outputWeight  = $ipprc->filename("PPIMAGE.CHIP.WEIGHT", $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
     110my $outputWeight  = $ipprc->filename("PPIMAGE.CHIP.VARIANCE", $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    111111my $outputBin1    = $ipprc->filename("PPIMAGE.BIN1",        $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    112112my $outputBin2    = $ipprc->filename("PPIMAGE.BIN2",        $outroot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR);
     
    182182    }
    183183
    184     my $outputWeightExpect = metadataLookupBool($recipeData, 'CHIP.WEIGHT.FITS');
     184    my $outputWeightExpect = metadataLookupBool($recipeData, 'CHIP.VARIANCE.FITS');
    185185    if ($outputWeightExpect) {
    186186        &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);
  • branches/pap_branch_20090128/ippScripts/scripts/detrend_stack.pl

    r19942 r21228  
    155155    my $image = $file->{uri};   # Image name
    156156    my $mask = $ipprc->filename( "PPIMAGE.OUTPUT.MASK", $file->{path_base}, $class_id ); # Mask name
    157     my $weight = $ipprc->filename( "PPIMAGE.OUTPUT.WEIGHT", $file->{path_base}, $class_id ); # Weight name
     157    my $weight = $ipprc->filename( "PPIMAGE.OUTPUT.VARIANCE", $file->{path_base}, $class_id ); # Weight name
    158158
    159159    &my_die("Image $image does not exist", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists( $image );
     
    164164    }
    165165    if ($ipprc->file_exists( $weight )) {
    166         print $listFile "\tWEIGHT\tSTR\t" . $weight . "\n";
     166        print $listFile "\tVARIANCE\tSTR\t" . $weight . "\n";
    167167    }
    168168
  • branches/pap_branch_20090128/ippScripts/scripts/diff_skycell.pl

    r20973 r21228  
    9999        if ($file->{warp_id} == 0) {
    100100            $templateMask = "PPSTACK.OUTPUT.MASK";
    101             $templateWeight = "PPSTACK.OUTPUT.WEIGHT";
     101            $templateWeight = "PPSTACK.OUTPUT.VARIANCE";
    102102            $templateSources = "PSPHOT.OUT.CMF.MEF";  ## this must be consistent with the value in stack_skycell.pl:161
    103103            ## use an explicit stack name for psphot output objects
    104104        } else {
    105105            $templateMask = "PSWARP.OUTPUT.MASK";
    106             $templateWeight = "PSWARP.OUTPUT.WEIGHT";
     106            $templateWeight = "PSWARP.OUTPUT.VARIANCE";
    107107            $templateSources = "PSWARP.OUTPUT.SOURCES";
    108108        }
     
    112112        if ($file->{warp_id} == 0) {
    113113            $inputMask = "PPSTACK.OUTPUT.MASK";
    114             $inputWeight = "PPSTACK.OUTPUT.WEIGHT";
     114            $inputWeight = "PPSTACK.OUTPUT.VARIANCE";
    115115        } else {
    116116            $inputMask = "PSWARP.OUTPUT.MASK";
    117             $inputWeight = "PSWARP.OUTPUT.WEIGHT";
     117            $inputWeight = "PSWARP.OUTPUT.VARIANCE";
    118118        }
    119119    }
     
    184184my $outputName = $ipprc->filename("PPSUB.OUTPUT", $outroot);
    185185my $outputMask = $ipprc->filename("PPSUB.OUTPUT.MASK", $outroot);
    186 my $outputWeight = $ipprc->filename("PPSUB.OUTPUT.WEIGHT", $outroot);
     186my $outputWeight = $ipprc->filename("PPSUB.OUTPUT.VARIANCE", $outroot);
    187187my $configuration = $ipprc->filename("PPSUB.CONFIG", $outroot);
    188188my $outputSources = $ipprc->filename("PSPHOT.OUT.CMF.MEF", $outroot);
  • branches/pap_branch_20090128/ippScripts/scripts/fake_imfile.pl

    r20100 r21228  
    108108my $chipImage     = $ipprc->filename("PPIMAGE.CHIP",        $chiproot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $fake_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    109109my $chipMask      = $ipprc->filename("PPIMAGE.CHIP.MASK",   $chiproot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $fake_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    110 my $chipWeight    = $ipprc->filename("PPIMAGE.CHIP.WEIGHT", $chiproot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $fake_id, $class_id, $PS_EXIT_CONFIG_ERROR);
     110my $chipWeight    = $ipprc->filename("PPIMAGE.CHIP.VARIANCE", $chiproot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $fake_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    111111my $chipPSF       = $ipprc->filename("PSPHOT.PSF.SAVE",     $chiproot, $class_id) or &my_die("Missing entry from camera config", $exp_id, $fake_id, $class_id, $PS_EXIT_CONFIG_ERROR);
    112112my $cameraObjects = $ipprc->filename("PSASTRO.OUTPUT",      $camroot)             or &my_die("Missing entry from camera config", $exp_id, $fake_id, $class_id, $PS_EXIT_CONFIG_ERROR);
  • branches/pap_branch_20090128/ippScripts/scripts/ipp_cleanup.pl

    r20504 r21228  
    109109            addFilename (\@files, "PPIMAGE.OUTPUT", $path_base, $class_id);
    110110            addFilename (\@files, "PPIMAGE.OUTPUT.MASK", $path_base, $class_id);
    111             addFilename (\@files, "PPIMAGE.OUTPUT.WEIGHT", $path_base, $class_id);
     111            addFilename (\@files, "PPIMAGE.OUTPUT.VARIANCE", $path_base, $class_id);
    112112            addFilename (\@files, "PPIMAGE.CHIP", $path_base, $class_id);
    113113            addFilename (\@files, "PPIMAGE.CHIP.MASK", $path_base, $class_id);
    114             addFilename (\@files, "PPIMAGE.CHIP.WEIGHT", $path_base, $class_id);
     114            addFilename (\@files, "PPIMAGE.CHIP.VARIANCE", $path_base, $class_id);
    115115            if ($mode eq "goto_purged") {
    116116                # additional files to remove for 'purge' mode
     
    277277            addFilename(\@files, "PSWARP.OUTPUT", $path_base, $skycell_id );
    278278            addFilename(\@files, "PSWARP.OUTPUT.MASK", $path_base, $skycell_id);
    279             addFilename(\@files, "PSWARP.OUTPUT.WEIGHT", $path_base, $skycell_id);
     279            addFilename(\@files, "PSWARP.OUTPUT.VARIANCE", $path_base, $skycell_id);
    280280            addFilename(\@files, "PSWARP.OUTPUT.SOURCES", $path_base, $skycell_id);
    281281
  • branches/pap_branch_20090128/ippScripts/scripts/magic_destreak.pl

    r21157 r21228  
    190190    $mask   = $ipprc->filename("PSASTRO.OUTPUT.MASK", $cam_path_base, $class_id);
    191191    $ch_mask= $ipprc->filename("PPIMAGE.CHIP.MASK", $path_base, $class_id);
    192     $weight = $ipprc->filename("PPIMAGE.CHIP.WEIGHT", $path_base, $class_id);
     192    $weight = $ipprc->filename("PPIMAGE.CHIP.VARIANCE", $path_base, $class_id);
    193193    $astrom = $ipprc->filename("PSASTRO.OUTPUT", $cam_path_base);
    194194} elsif ($stage eq "warp") {
    195195    $mask   = $ipprc->filename("PSWARP.OUTPUT.MASK", $path_base);
    196     $weight = $ipprc->filename("PSWARP.OUTPUT.WEIGHT", $path_base);
     196    $weight = $ipprc->filename("PSWARP.OUTPUT.VARIANCE", $path_base);
    197197} elsif ($stage eq "diff") {
    198198    $mask   = $ipprc->filename("PPSUB.OUTPUT.MASK", $path_base);
    199     $weight = $ipprc->filename("PPSUB.OUTPUT.WEIGHT", $path_base);
     199    $weight = $ipprc->filename("PPSUB.OUTPUT.VARIANCE", $path_base);
    200200}
    201201
  • branches/pap_branch_20090128/ippScripts/scripts/magic_process.pl

    r21158 r21228  
    318318    my $image = $ipprc->file_resolve($ipprc->filename("PPSUB.OUTPUT", $input_base));
    319319    my $mask = $ipprc->file_resolve($ipprc->filename("PPSUB.OUTPUT.MASK", $input_base));
    320     my $weight= $ipprc->file_resolve($ipprc->filename("PPSUB.OUTPUT.WEIGHT", $input_base));
     320    my $weight= $ipprc->file_resolve($ipprc->filename("PPSUB.OUTPUT.VARIANCE", $input_base));
    321321
    322322    return ($image, $mask, $weight);
  • branches/pap_branch_20090128/ippScripts/scripts/stack_skycell.pl

    r21145 r21228  
    158158    my $image = $file->{uri};   # Image name
    159159    my $mask = $ipprc->filename( "PSWARP.OUTPUT.MASK", $file->{path_base} ); # Mask name
    160     my $weight = $ipprc->filename( "PSWARP.OUTPUT.WEIGHT", $file->{path_base} ); # Weight name
     160    my $weight = $ipprc->filename( "PSWARP.OUTPUT.VARIANCE", $file->{path_base} ); # Weight name
    161161    my $psf = $ipprc->filename( "PSPHOT.PSF.SKY.SAVE", $file->{path_base} ); # PSF name
    162162    my $sources = $ipprc->filename("PSWARP.OUTPUT.SOURCES", $file->{path_base}); # Sources name
     
    170170    print $listFile "\tIMAGE\tSTR\t" . $image . "\n";
    171171    print $listFile "\tMASK\tSTR\t" . $mask . "\n";
    172     print $listFile "\tWEIGHT\tSTR\t" . $weight . "\n";
     172    print $listFile "\tVARIANCE\tSTR\t" . $weight . "\n";
    173173    print $listFile "\tPSF\tSTR\t" . $psf . "\n";
    174174    print $listFile "\tSOURCES\tSTR\t" . $sources . "\n";
     
    183183my $outputName = $ipprc->filename("PPSTACK.OUTPUT", $outroot);
    184184my $outputMask = $ipprc->filename("PPSTACK.OUTPUT.MASK", $outroot);
    185 my $outputWeight = $ipprc->filename("PPSTACK.OUTPUT.WEIGHT", $outroot);
     185my $outputWeight = $ipprc->filename("PPSTACK.OUTPUT.VARIANCE", $outroot);
    186186my $outputSources = $ipprc->filename("PSPHOT.OUT.CMF.MEF", $outroot); ## this must be consistent with the value in diff_skycell.pl:101
    187187## use an explicit stack name for psphot output objects
     
    333333        my $temp_image = metadataLookupStr($md, 'TEMP.IMAGE'); # Suffix for image
    334334        my $temp_mask = metadataLookupStr($md, 'TEMP.MASK'); # Suffix for mask
    335         my $temp_weight = metadataLookupStr($md, 'TEMP.WEIGHT'); # Suffix for weight
     335        my $temp_weight = metadataLookupStr($md, 'TEMP.VARIANCE'); # Suffix for weight
    336336        my $temp_root = basename($outroot); # Root name for temporary files
    337337
  • branches/pap_branch_20090128/ippScripts/scripts/warp_skycell.pl

    r21179 r21228  
    115115my $outputImage = $ipprc->filename("PSWARP.OUTPUT", $outroot, $skycell_id );
    116116my $outputMask = $ipprc->filename("PSWARP.OUTPUT.MASK", $outroot, $skycell_id);
    117 my $outputWeight = $ipprc->filename("PSWARP.OUTPUT.WEIGHT", $outroot, $skycell_id);
     117my $outputWeight = $ipprc->filename("PSWARP.OUTPUT.VARIANCE", $outroot, $skycell_id);
    118118my $outputSources = $ipprc->filename("PSWARP.OUTPUT.SOURCES", $outroot, $skycell_id);
    119119my $outputPSF = $ipprc->filename("PSPHOT.PSF.SKY.SAVE", $outroot);
     
    143143foreach my $imfile (@$imfiles) {
    144144    my $image = $imfile->{uri}; # Image name
    145     my $weight = $ipprc->filename("PPIMAGE.CHIP.WEIGHT", $imfile->{chip_path_base}, $imfile->{class_id}); # Mask name
     145    my $weight = $ipprc->filename("PPIMAGE.CHIP.VARIANCE", $imfile->{chip_path_base}, $imfile->{class_id}); # Mask name
    146146
    147147    my $mask = $ipprc->filename("PSASTRO.OUTPUT.MASK", $imfile->{cam_path_base}, $imfile->{class_id}); # Mask name
Note: See TracChangeset for help on using the changeset viewer.