IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jul 17, 2014, 12:30:45 PM (12 years ago)
Author:
eugene
Message:

merge changes (from past YEAR) into trunk

Location:
branches/eam_branches/ipp-ops-20130712/psphot
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-ops-20130712/psphot

    • Property svn:mergeinfo deleted

  • branches/eam_branches/ipp-ops-20130712/psphot/src

    • Property svn:ignore

      •  

        old new  
        2424psphotModelTest
        2525psphotMinimal
         26psphotFullForce
         27psmakecff
         28psphotFullForceSummary
    • Property svn:mergeinfo deleted

  • branches/eam_branches/ipp-ops-20130712/psphot/src/psphotVisual.c

    r35769 r37066  
    14441444            coord->data.F32[1] = r;
    14451445            coord->data.F32[0] = 0.0;
    1446             fmaj->data.F32[i] = log10(source->modelPSF->modelFunc (NULL, params, coord));
     1446            fmaj->data.F32[i] = log10(source->modelPSF->class->modelFunc (NULL, params, coord));
    14471447
    14481448            coord->data.F32[0] = r;
    14491449            coord->data.F32[1] = 0.0;
    1450             fmin->data.F32[i] = log10(source->modelPSF->modelFunc (NULL, params, coord));
     1450            fmin->data.F32[i] = log10(source->modelPSF->class->modelFunc (NULL, params, coord));
    14511451        }
    14521452        psFree (coord);
    14531453        psFree (params);
    14541454
    1455         float FWHM_MAJOR = 2.0*source->modelPSF->modelRadius (source->modelPSF->params, 0.5*source->modelPSF->params->data.F32[PM_PAR_I0]);
     1455        float FWHM_MAJOR = 2.0*source->modelPSF->class->modelRadius (source->modelPSF->params, 0.5*source->modelPSF->params->data.F32[PM_PAR_I0]);
    14561456        float FWHM_MINOR = FWHM_MAJOR * (axes.minor / axes.major);
    14571457        if (FWHM_MAJOR < FWHM_MINOR) PS_SWAP (FWHM_MAJOR, FWHM_MINOR);
Note: See TracChangeset for help on using the changeset viewer.