Changeset 27840 for branches/simtest_nebulous_branches/ppSim/src/ppSimInsertStars.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

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

branches/simtest_nebulous_branches/ppSim/src/ppSimInsertStars.c

@@ -26 +26 @@
     float expTime   = psMetadataLookupF32(NULL, recipe, "EXPTIME"); // Exposure time
     float darkRate  = psMetadataLookupF32(NULL, recipe, "DARK.RATE"); // Dark rate
+    float nSigmaLim = psMetadataLookupF32(NULL, recipe, "STARS.SIGMA.LIM"); // significance of faintest stars
 
     float readnoise = psMetadataLookupF32(NULL, cell->concepts, "CELL.READNOISE");// CCD read noise, e
@@ -106 +107 @@
         pmModelSetFlux (model, flux);
 
-        // XXX let the flux limit be a user-defined number of sky sigmas (not just 1.0)
-        float radius = model->modelRadius (model->params, roughNoise);
+        float radius = model->modelRadius (model->params, nSigmaLim * roughNoise);
         radius = PS_MAX (radius, 1.0);
 
@@ -136 +136 @@
         RESET(source->maskView);
         RESET(source->modelFlux);
-        RESET(source->psfFlux);
+        RESET(source->psfImage);
         RESET(source->blends);
 
@@ -145 +145 @@
     fclose (outfile);
 
-    // NOTE: the pmFPAfile "PPSIM.OUTPUT" points at these sources
-    psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_DATA_ARRAY, "fake sources", sources);
-    psFree(sources);
+    pmDetections *detections = pmDetectionsAlloc();
+    detections->allSources = sources;
+
+    // save detections on the readout->analysis
+    if (!psMetadataAddPtr (readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_META_REPLACE | PS_DATA_UNKNOWN, "fake sources", detections)) {
+        psError (PSPHOT_ERR_CONFIG, false, "problem saving detections on readout");
+        return false;
+    }
+    psFree(detections);
 
     // XXX many leaks in here, i think