Changeset 36884 for branches/eam_branches/ipp-20140610/ppSim/src/ppSimInsertGalaxies.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)
• ppSim/src/ppSimInsertGalaxies.c (modified) (3 diffs)

branches/eam_branches/ipp-20140610/ppSim/src/ppSimInsertGalaxies.c

@@ -145 +145 @@
             axes.minor       = galaxy->Rmin;
             axes.theta       = galaxy->theta;
-            pmPSF_AxesToModel (PAR, axes, type);
+            pmPSF_AxesToModel (PAR, axes, model->class->useReff);
         }
         psF64 Area = 2.0 * M_PI * galaxy->Rmaj * galaxy->Rmin;
@@ -154 +154 @@
 
         // XXX let the flux limit be a user-defined number of sky sigmas (not just 1.0)
-        float radius = model->modelRadius (model->params, 0.1*roughNoise);
+        float radius = model->class->modelRadius (model->params, 0.1*roughNoise);
         radius = PS_MAX (radius, 1.0);
 
@@ -163 +163 @@
         pmSource *source = pmSourceFromModel (model, readout, radius, PM_SOURCE_TYPE_EXTENDED);
 
-        galaxy->flux = model->modelFlux (model->params);
+        galaxy->flux = model->class->modelFlux (model->params);
 
         // XXX set the mag & err values (should this be done in pmSourceFromModel?)