Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/ppSim/src/ppSimInsertStars.c

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• ppSim/src/ppSimInsertStars.c (modified) (2 diffs)

branches/eam_branches/ps2-tc3-20130727/ppSim/src/ppSimInsertStars.c

@@ -116 +116 @@
         // (inserting flux with a variable radius introduces a flux-dependent bias)
         if (radius < 0) {
-          radius = model->modelRadius (model->params, nSigmaLim * roughNoise);
+          radius = model->class->modelRadius (model->params, nSigmaLim * roughNoise);
           radius = PS_MAX (radius,  1.0);
           radius = PS_MIN (radius, 50.0);
@@ -126 +126 @@
         // XXX set the mag & err values (should this be done in pmSourceFromModel?)
         // XXX i should be applying the gain and the correct effective area
-        psEllipseAxes axes = pmPSF_ModelToAxes (model->params->data.F32, model->type);
+        psEllipseAxes axes = pmPSF_ModelToAxes (model->params->data.F32, model->class->useReff);
         float Area = 2.0 * M_PI * axes.major * axes.minor;