Changeset 28125 for trunk/ppSim

Timestamp:

May 26, 2010, 4:31:49 PM (16 years ago)

Author:

eugene

Message:

add ppSim option to convolve to a PSF rather than generating stars with the specified PSF

Location:

trunk/ppSim/src

Files:

• Makefile.am (modified) (1 diff)
• ppSim.h (modified) (1 diff)
• ppSimInsertStars.c (modified) (2 diffs)
• ppSimLoop.c (modified) (2 diffs)
• ppSimSmoothReadout.c (added)

trunk/ppSim/src/Makefile.am

@@ -43 +43 @@
         ppSimBounds.c             \
         ppSimStars.c              \
+        ppSimSmoothReadout.c      \
         ppSimSetPSF.c             \
         ppSimUtils.c              \

trunk/ppSim/src/ppSim.h

@@ -106 +106 @@
 bool ppSimInsertStars (pmReadout *readout, psImage *expCorr, psArray *stars, pmConfig *config);
 
+bool ppSimSmoothReadout(pmReadout *input, psMetadata *recipe);
+
 bool ppSimInitHeader(pmConfig *config,
                      pmFPA *fpa,

trunk/ppSim/src/ppSimInsertStars.c

@@ -23 +23 @@
     // XXX this is missing the gain.
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSIM_RECIPE); // Recipe
+
+    bool psfConvolve = psMetadataLookupBool(NULL, recipe, "PSF.CONVOLVE"); // smooth the image with the PSF?
 
     float expTime   = psMetadataLookupF32(NULL, recipe, "EXPTIME"); // Exposure time
@@ -103 +105 @@
         float flux = star->flux * expCorr->data.F32[(int)yCell][(int)xCell];
 
-        // instantiate a model for the PSF at this location, set desired flux
-        pmModel *model = pmModelFromPSFforXY (psf, xChip, yChip, 1.0);
-        pmModelSetFlux (model, flux);
+        // if psfConvolve is TRUE, we will (elsewhere) convolve the image we a PSF
+        // in this case, simply place delta functions in the image
+        if (psfConvolve) {
+            readout->image->data.F32[(int)(yCell)][(int)(xCell)] = flux;
+            continue;
+        }
 
-        float radius = model->modelRadius (model->params, nSigmaLim * roughNoise);
-        radius = PS_MAX (radius, 1.0);
+        // instantiate a model for the PSF at this location, set desired flux
+        pmModel *model = pmModelFromPSFforXY (psf, xChip, yChip, 1.0);
+        pmModelSetFlux (model, flux);
 
-        // construct a source, with model flux pixels set, based on the model
-        pmSource *source = pmSourceFromModel (model, readout, radius, PM_SOURCE_TYPE_STAR);
+        float radius = model->modelRadius (model->params, nSigmaLim * roughNoise);
+        radius = PS_MAX (radius, 1.0);
 
-        // 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);
-        psF64 Area = 2.0 * M_PI * axes.major * axes.minor;
+        // construct a source, with model flux pixels set, based on the model
+        pmSource *source = pmSourceFromModel (model, readout, radius, PM_SOURCE_TYPE_STAR);
 
-        // this value is the pure (input) flux, and is saved in the output source cmf files
-        source->psfMag = -2.5*log10(star->flux);
-        source->errMag = sqrt(Area*PS_SQR(roughNoise) + flux) / flux;
+        // 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);
+        psF64 Area = 2.0 * M_PI * axes.major * axes.minor;
 
-        fprintf (outfile, "%8.3f %8.3f  %10.2f  %7.3f %5.3f\n", star->x, star->y, star->flux, source->psfMag, source->errMag);
+        // this value is the pure (input) flux, and is saved in the output source cmf files
+        source->psfMag = -2.5*log10(star->flux);
+        source->errMag = sqrt(Area*PS_SQR(roughNoise) + flux) / flux;
 
-        // insert the source flux in the image
-        pmSourceAddWithOffset (source, PM_MODEL_OP_FULL, 0xff, dX, dY);
+        fprintf (outfile, "%8.3f %8.3f  %10.2f  %7.3f %5.3f\n", star->x, star->y, star->flux, source->psfMag, source->errMag);
 
-        // insert the source flux in the noise image
-        pmSourceAddWithOffset (source, PM_MODEL_OP_FULL | PM_MODEL_OP_NOISE, 0xff, dX, dY);
+        // insert the source flux in the image
+        pmSourceAddWithOffset (source, PM_MODEL_OP_FULL, 0xff, dX, dY);
 
-        // Blow away the image parts of the source, which makes the memory explode
-        RESET(source->pixels);
-        RESET(source->variance);
-        RESET(source->maskObj);
-        RESET(source->maskView);
-        RESET(source->modelFlux);
-        RESET(source->psfImage);
-        RESET(source->blends);
+        // insert the source flux in the noise image
+        pmSourceAddWithOffset (source, PM_MODEL_OP_FULL | PM_MODEL_OP_NOISE, 0xff, dX, dY);
 
-        // add the sources to the source array
-        psArrayAdd (sources, 100,source);
-        psFree(source);                 // Drop reference
+        // Blow away the image parts of the source, which makes the memory explode
+        RESET(source->pixels);
+        RESET(source->variance);
+        RESET(source->maskObj);
+        RESET(source->maskView);
+        RESET(source->modelFlux);
+        RESET(source->psfImage);
+        RESET(source->blends);
+
+        // add the sources to the source array
+        psArrayAdd (sources, 100,source);
+        psFree(source);                 // Drop reference
     }
     fclose (outfile);

trunk/ppSim/src/ppSimLoop.c

@@ -30 +30 @@
     ppSimType type = ppSimTypeFromString (typeStr); // Type of image to simulate
     int binning = psMetadataLookupS32(NULL, recipe, "BINNING"); // Binning in x and y
+
+    bool psfConvolve = psMetadataLookupBool(NULL, recipe, "PSF.CONVOLVE"); // smooth the image with the PSF?
 
     ppSimUpdateConceptsFPA (fpa, config);
@@ -155 +157 @@
                 psFree(expCorr);
 
+                // we have two options for generating images which have a PSF:
+                // 1) lay down stars with the PSF model applied : in this case, galaxies do NOT have the PSF
+                // 2) lay down delta functions for stars and smooth the image with a PSF : in this case, the stars land at integer pixel locations
+                if (psfConvolve) {
+                    if (!ppSimSmoothReadout(readout, recipe)) ESCAPE (PS_ERR_UNKNOWN, "problem smoothing image");
+                }
+
             done:
                 if (!ppSimAddNoise(readout->image, readout->variance, cell, config, rng)) ESCAPE (PS_ERR_UNKNOWN, "problem adding noise");