Changeset 31606 for branches/czw_branch/20110406/ppSim/src/ppSimInsertStars.c

Timestamp:

Jun 6, 2011, 1:56:22 PM (15 years ago)

Author:

watersc1

Message:

merge from trunk before working on new stacking code

Location:

branches/czw_branch/20110406

Files:

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

branches/czw_branch/20110406/ppSim/src/ppSimInsertStars.c

@@ -121 +121 @@
 
         source->psfMag = -2.5*log10(star->flux);
-        source->errMag = sqrt(Area*PS_SQR(roughNoise) + flux) / flux;
+        source->psfMagErr = sqrt(Area*PS_SQR(roughNoise) + flux) / flux;
         
         // set the expected model errors
-        model->dparams->data.F32[PM_PAR_I0] = source->errMag * model->params->data.F32[PM_PAR_I0];
+        model->dparams->data.F32[PM_PAR_I0] = source->psfMagErr * model->params->data.F32[PM_PAR_I0];
 
         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->errMag, axes.major, axes.minor, axes.theta, par8);
+        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);
 
         // if psfConvolve is TRUE, we will (elsewhere) convolve the image we a PSF