Changeset 36884 for branches/eam_branches/ipp-20140610/psModules/src/objects/pmSource.c

Timestamp:

Jun 17, 2014, 5:58:38 AM (12 years ago)

Author:

eugene

Message:

merge in changes from trunk (up through pv3 tag)

Location:

branches/eam_branches/ipp-20140610

Files:

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

branches/eam_branches/ipp-20140610/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);