IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 32150


Ignore:
Timestamp:
Aug 21, 2011, 10:19:12 AM (15 years ago)
Author:
eugene
Message:

modifiy pmPSF_AxesToModel to take model type

Location:
branches/eam_branches/ipp-20110710/psModules/src/objects
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_CMF_PS1_DV1.c

    r31451 r32150  
    263263        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
    264264
    265         pmPSF_AxesToModel (PAR, axes);
     265        pmPSF_AxesToModel (PAR, axes, modelType);
    266266
    267267        float peakMag     = psMetadataLookupF32 (&status, row, "PEAK_FLUX_AS_MAG");
    … …  
    547547            yErr = dPAR[PM_PAR_YPOS];
    548548
    549             axes = pmPSF_ModelToAxes (PAR, 20.0);
     549            axes = pmPSF_ModelToAxes (PAR, 20.0, model->type);
    550550
    551551            row = psMetadataAlloc ();

  • branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceIO_PS1_DEV_1.c

    r31451 r32150  
    9595            yErr = dPAR[PM_PAR_YPOS];
    9696            if (isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXX])) {
    97                 axes = pmPSF_ModelToAxes (PAR, 20.0);
     97                axes = pmPSF_ModelToAxes (PAR, 20.0, model->type);
    9898            } else {
    9999                axes.major = NAN;
    … …  
    257257        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
    258258
    259         pmPSF_AxesToModel (PAR, axes);
     259        pmPSF_AxesToModel (PAR, axes, modelType);
    260260
    261261        float peakMag     = psMetadataLookupF32 (&status, row, "PEAK_FLUX_AS_MAG");
    … …  
    522522            yErr = dPAR[PM_PAR_YPOS];
    523523
    524             axes = pmPSF_ModelToAxes (PAR, 20.0);
     524            axes = pmPSF_ModelToAxes (PAR, 20.0, model->type);
    525525
    526526            row = psMetadataAlloc ();

  • branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceOutputs.c

    r31927 r32150  
    107107        }
    108108        if (isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXY]) && isfinite(PAR[PM_PAR_SYY])) {
    109             axes = pmPSF_ModelToAxes (PAR, 20.0);
     109            axes = pmPSF_ModelToAxes (PAR, 20.0, model->type);
    110110            outputs->psfMajor = axes.major;
    111111            outputs->psfMinor = axes.minor;

  • branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourcePlotPSFModel.c

    r29004 r32150  
    145145        // force the axis ratio to be < 20.0
    146146        psEllipseAxes axes_mnt = psEllipseMomentsToAxes (moments, 20.0);
    147         psEllipseAxes axes_psf = pmPSF_ModelToAxes (PAR, 20.0);
     147        psEllipseAxes axes_psf = pmPSF_ModelToAxes (PAR, 20.0, model->type);
    148148
    149149        // moments major axis
Note: See TracChangeset for help on using the changeset viewer.