Changeset 32350 for trunk/ppSim/src/ppSimInsertStars.c

Timestamp:

Sep 6, 2011, 1:34:52 PM (15 years ago)

Author:

eugene

Message:

fix the mags of input stars and galaxies (prove we inserted the amount of flux we expected); realistic galaxy luminosity function

File:

• trunk/ppSim/src/ppSimInsertStars.c (modified) (6 diffs)

trunk/ppSim/src/ppSimInsertStars.c

@@ -6 +6 @@
     PTR = NULL;
 
+float imageSum (psImage *image);
 
 bool ppSimInsertStars (pmReadout *readout, psImage *expCorr, psArray *stars, pmConfig *config) {
@@ -111 +112 @@
         float radius = model->modelRadius (model->params, nSigmaLim * roughNoise);
         radius = PS_MAX (radius, 1.0);
+        radius = 20.0;
 
         // construct a source, with model flux pixels set, based on the model
@@ -117 +119 @@
         // 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, 20.0);
+        psEllipseAxes axes = pmPSF_ModelToAxes (model->params->data.F32, 20.0, model->type);
         float Area = 2.0 * M_PI * axes.major * axes.minor;
 
@@ -127 +129 @@
 
         float par8 = (model->params->n == 8) ? model->params->data.F32[7] : 0.0;
-        fprintf (outfile, "%8.3f %8.3f %10.2f  %2d  %7.3f %5.3f  %5.3f %5.3f %5.3f %5.3f\n", star->x, star->y, star->flux, 0, source->psfMag, source->psfMagErr, axes.major, axes.minor, axes.theta, par8);
+        float starFlux = 0.0;
 
         // if psfConvolve is TRUE, we will (elsewhere) convolve the image we a PSF
@@ -135 +137 @@
         } else {
             // insert the source flux in the image
+            float sum1 = imageSum(source->pixels);
             pmSourceAddWithOffset (source, PM_MODEL_OP_FULL, 0xff, dX, dY);
+            float sum2 = imageSum(source->pixels);
+            starFlux = sum2 - sum1;
             
             // insert the source flux in the noise image
@@ -149 +154 @@
             RESET(source->blends);
         }
+        fprintf (outfile, "%8.3f %8.3f %10.2f  %2d  %7.3f %5.3f  %5.3f %5.3f %5.3f %5.3f  :  %f %f\n", star->x, star->y, starFlux, 0, source->psfMag, source->psfMagErr, axes.major, axes.minor, axes.theta, par8, model->params->data.F32[PM_PAR_I0], radius);
 
         // add the sources to the source array