IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 19, 2014, 4:14:54 PM (12 years ago)
Author:
eugene
Message:

merge from trunk; add -photcode-rule option to pmConfig

Location:
branches/eam_branches/ipp-20140610/psModules
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140610/psModules

  • branches/eam_branches/ipp-20140610/psModules/src/objects

    • Property svn:ignore

      •  

        old new  
        1515pmSourceIO_CMF_PS1_SV1.c
        1616pmSourceIO_CMF_PS1_SV2.c
         17pmSourceIO_CMF_PS1_SV3.c
        1718pmSourceIO_CMF_PS1_DV1.c
        1819pmSourceIO_CMF_PS1_DV2.c
        1920pmSourceIO_CMF_PS1_DV3.c
        20 
         21pmSourceIO_CMF_PS1_DV4.c

  • branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSF_IO.c

    r36884 r36916  
    511511        psMetadataAddF32 (header, PS_LIST_TAIL, "SKY_BIAS", PS_DATA_F32, "sky bias level", psf->skyBias);
    512512
    513         float PSF_APERTURE =  psMetadataLookupF32(&status, roAnalysis, "PSF_APERTURE");
    514         if (status) {
     513        if (roAnalysis) {
     514          float PSF_APERTURE =  psMetadataLookupF32(&status, roAnalysis, "PSF_APERTURE");
     515          if (status) {
    515516            psMetadataAddF32 (header, PS_LIST_TAIL, "PSF_APERTURE", PS_DATA_F32, "aperture for psf objects", PSF_APERTURE);
    516         }
    517         float PSF_FIT_RADIUS =  psMetadataLookupF32(&status, roAnalysis, "PSF_FIT_RADIUS");
    518         if (status) {
     517          }
     518          float PSF_FIT_RADIUS =  psMetadataLookupF32(&status, roAnalysis, "PSF_FIT_RADIUS");
     519          if (status) {
    519520            psMetadataAddF32 (header, PS_LIST_TAIL, "PSF_FIT_RADIUS", PS_DATA_F32, "aperture for psf objects", PSF_FIT_RADIUS);
     521          }
    520522        }
    521523
Note: See TracChangeset for help on using the changeset viewer.