Changeset 36860 for trunk/psModules/src/objects/pmSource.c

Timestamp:

Jun 13, 2014, 8:47:47 AM (12 years ago)

Author:

eugene

Message:

add psfCore to the outputs structure, assign only for PS1_V1 and QGAUSS models; add apNpixels to source & set with pmSourcePhotometryAper; use new pmModel.class.functions; add AP_NPIX,PSF_CORE,PSF_FWHM_MAJ,PSF_FWHM_MIN to output CMF (PS1_V5+, PS1_DV4+, PS1_SV3+), AP_MAG_RADIUS was S32 on read (how did this work??)

File:

• trunk/psModules/src/objects/pmSource.c (modified) (4 diffs)

trunk/psModules/src/objects/pmSource.c

@@ -33 +33 @@
 #include "pmMoments.h"
 #include "pmModelFuncs.h"
+#include "pmModelClass.h"
 #include "pmModel.h"
 #include "pmModelUtils.h"
-#include "pmModelClass.h"
 #include "pmSourceMasks.h"
 #include "pmSourceExtendedPars.h"
@@ -146 +146 @@
     source->apMagRaw         = NAN;
     source->apRadius         = NAN;
+    source->apNpixels        = 0;
     source->apFlux           = NAN;
     source->apFluxErr        = NAN; 
@@ -237 +238 @@
     source->apMagRaw         = in->apMagRaw;
     source->apRadius         = in->apRadius;
+    source->apNpixels        = in->apNpixels;
     source->apFlux           = in->apFlux;
     source->apFluxErr        = in->apFluxErr;
@@ -987 +989 @@
     if (!isfinite(oldI0)) return false;
 
-    bool useReff = pmModelUseReff (model->type);
+    bool useReff = model->class->useReff;
     pmModelParamsToAxes (&axes, PAR[PM_PAR_SXX], PAR[PM_PAR_SXY], PAR[PM_PAR_SYY], useReff);