Changeset 14547 for branches/eam_branch_20070817/ppSim/src/ppSimInsertSources.c

Timestamp:

Aug 19, 2007, 4:21:10 PM (19 years ago)

Author:

eugene

Message:

convert ppSimLoop to use pmReadout, loading psf model, add sources based on psf model

File:

• branches/eam_branch_20070817/ppSim/src/ppSimInsertSources.c (modified) (3 diffs)

branches/eam_branch_20070817/ppSim/src/ppSimInsertSources.c

@@ -1 +1 @@
 # include "ppSim.h"
 
-bool ppSimInsertSources (psImage *signal, psImage *variance, psImage *expCorr, psArray *stars, pmConfig *config, pmChip *chip, pmCell *cell) {
+bool ppSimInsertSources (pmReadout *readout, psImage *expCorr, psArray *stars, pmConfig *config) {
 
-    bool mdok;
 
     assert (stars);
     
+    pmCell *cell = readout->parent;
+    pmChip *chip = cell->parent;
+
+    // XXX we probably need this to get the size right
+# if (0)
+    bool mdok;
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSIM_RECIPE); // Recipe
 
-    float seeing = psMetadataLookupF32(NULL, config->arguments, "SEEING"); // Seeing sigma (pix)
     float expTime = psMetadataLookupF32(NULL, config->arguments, "EXPTIME"); // Exposure time
     float skyRate = psMetadataLookupF32(NULL, config->arguments, "SKY.RATE"); // Sky rate
@@ -23 +27 @@
     }
 
+    // Rough noise estimate, appropriate for entire cell (use for source radius?)
+    float roughNoise = sqrtf(PS_SQR(readnoise) + (darkRate + skyRate) * expTime);
+# endif
+
     int x0Chip = psMetadataLookupS32(NULL, chip->concepts, "CHIP.X0");
     int y0Chip = psMetadataLookupS32(NULL, chip->concepts, "CHIP.Y0");
@@ -35 +43 @@
     int binning = psMetadataLookupS32(NULL, config->arguments, "BINNING"); // Binning in x and y
 
-    // Rough noise estimate, appropriate for entire cell
-    float roughNoise = sqrtf(PS_SQR(readnoise) + (darkRate + skyRate) * expTime);
-
     pmPSF *psf = psMetadataLookupPtr (NULL, chip->analysis, "PSF");
 
+    int dX = PM_CELL_TO_CHIP (0.0, x0Cell, xParityCell, binning);
+    int dY = PM_CELL_TO_CHIP (0.0, y0Cell, yParityCell, binning);
+
+    // add sources to the readout image & weight
     for (long i = 0; i < stars->n; i++) {
         ppSimStar *star = stars->data[i];
 
+        // star->x,y are in fpa coordinates
+
         // Position on the cell and peak flux
-        float x = PPSIM_FPA_TO_CELL(star->x, x0Cell, xParityCell, binning, x0Chip, xParityChip);
-        float y = PPSIM_FPA_TO_CELL(star->y, y0Cell, yParityCell, binning, y0Chip, yParityChip);
+        float xChip = PM_FPA_TO_CHIP(star->x, x0Chip, xParityChip);
+        float yChip = PM_FPA_TO_CHIP(star->y, y0Chip, yParityChip);
 
-        // instantiate a model for the PSF at this location (normalized or not?)
-        // XXX 
-        pmModel *model = pmModelFromPSFforXY (psf, star->x, star->y, star->flux);
+        // Position on the cell and peak flux
+        float xCell = PM_CHIP_TO_CELL(xChip, x0Cell, xParityCell, binning);
+        float yCell = PM_CHIP_TO_CELL(yChip, y0Cell, yParityCell, binning);
+
+        if (xCell < 0) continue;
+        if (yCell < 0) continue;
+        if (xCell > readout->image->numCols) continue;
+        if (yCell > readout->image->numRows) continue;
+        // XXX need to apply col0, row0 if readout is a subarray
+
+        // XXX apply the expCorr to the star->flux before setting the model flux
+
+        // instantiate a model for the PSF at this location, set desired flux
+        pmModel *model = pmModelFromPSFforXY (psf, xChip, yChip, 1.0);
+        pmModelSetFlux (model, star->flux);
 
         // construct a source, with model flux pixels set, based on the model
-        pmSource *source = pmSourceFromModel (model);
+        pmSource *source = pmSourceFromModel (model, readout, PM_SOURCE_TYPE_STAR);
 
-        ppSimInsertSource(signal, variance, x, y, star->flux, roughNoise, seeing, expCorr);
+        // XXX add the sources to a source array
+
+        pmSourceAddWithOffset (source, PM_MODEL_OP_FULL, 0xff, dX, dY);
     }
+
+    // XXX add the source array to the readout analysis
+
     return true;
 }