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/psphotEfficiency.c

    r34353 r37066  
    7171                continue;
    7272            }
    73             float flux = normModel->modelFlux(normModel->params); // Total flux for peak of 1.0
     73            float flux = normModel->class->modelFlux(normModel->params); // Total flux for peak of 1.0
    7474            psFree(normModel);
    7575            if (!isfinite(flux)) {
    … …  
    424424                    continue;
    425425                }
    426                 float sourceRadius = PS_MAX(radius, model->modelRadius(model->params, minFlux)); // Radius for source
     426                float sourceRadius = PS_MAX(radius, model->class->modelRadius(model->params, minFlux)); // Radius for source
    427427                psFree(model);
    428428                if (!isfinite(sourceRadius)) {
Note: See TracChangeset for help on using the changeset viewer.