Changeset 27840 for branches/simtest_nebulous_branches/ppSim

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/Makefile.am (modified) (3 diffs)
• ppSim/src/ppSim.h (modified) (1 diff)
• ppSim/src/ppSimAddNoise.c (modified) (1 diff)
• ppSim/src/ppSimInsertGalaxies.c (modified) (2 diffs)
• ppSim/src/ppSimInsertStars.c (modified) (4 diffs)
• ppSim/src/ppSimLoadForceSources.c (modified) (1 diff)
• ppSim/src/ppSimLoadStars.c (modified) (2 diffs)
• ppSim/src/ppSimLoop.c (modified) (3 diffs)
• ppSim/src/ppSimMakeStarGrid.c (copied) (copied from trunk/ppSim/src/ppSimMakeStarGrid.c )
• ppSim/src/ppSimMakeStars.c (modified) (1 diff)
• ppSim/src/ppSimPhotom.c (modified) (2 diffs)
• ppSim/src/ppSimPhotomReadout.c (modified) (7 diffs)
• ppSim/src/ppSimPhotomReadoutFake.c (modified) (6 diffs)
• ppSim/src/ppSimPhotomReadoutForce.c (modified) (5 diffs)
• ppSim/src/ppSimSetPSF.c (modified) (2 diffs)
• ppSim/src/ppSimUtils.c (modified) (1 diff)

branches/simtest_nebulous_branches/ppSim/src/Makefile.am

@@ -30 +30 @@
         ppSimLoadStars.c          \
         ppSimMakeStars.c          \
+        ppSimMakeStarGrid.c       \
         ppSimMakeGalaxies.c       \
         ppSimMakeBiassec.c        \
@@ -47 +48 @@
         ppSimLoadSpots.c          \
         ppSimPhotom.c             \
-        ppSimPhotomReadoutFake.c  \
-        ppSimPhotomReadoutForce.c \
         ppSimPhotomFiles.c        \
         ppSimLoadForceSources.c   \
@@ -59 +58 @@
         ppSimBadCTE.c             \
         ppSimVersion.c
+
+# these functions have been broken by the API change in psphot (Jan 2010)
+#       ppSimPhotomReadoutFake.c  
+#       ppSimPhotomReadoutForce.c 
 
 ppSimSequence_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS)

branches/simtest_nebulous_branches/ppSim/src/ppSim.h

@@ -103 +103 @@
 bool ppSimLoadStars (psArray *stars, pmFPA *fpa, pmConfig *config);
 bool ppSimMakeStars(psArray *stars, pmFPA *fpa, pmConfig *config, const psRandom *rng);
+bool ppSimMakeStarGrid(psArray *stars, pmFPA *fpa, pmConfig *config, const psRandom *rng);
 bool ppSimInsertStars (pmReadout *readout, psImage *expCorr, psArray *stars, pmConfig *config);
 

branches/simtest_nebulous_branches/ppSim/src/ppSimAddNoise.c

@@ -16 +16 @@
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSIM_RECIPE); // Recipe
 
-    float gain = psMetadataLookupF32(NULL, cell->concepts, "CELL.GAIN"); // CCD gain, e/ADU
+    // the recipe should set GAIN to NAN, and only modify to override the concept value
+    float gain = psMetadataLookupF32(&mdok, recipe, "GAIN"); // CCD gain, e/ADU
     if (isnan(gain)) {
-        psWarning("CELL.GAIN is not set; reverting to recipe value GAIN.");
-        gain = psMetadataLookupF32(&mdok, recipe, "GAIN");
+        gain = psMetadataLookupF32(&mdok, cell->concepts, "CELL.GAIN");
         if (!mdok) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Unable to find GAIN in recipe.");
-            return false;
+            psWarning("CELL.GAIN is not set; assuming gain of 1.0.");
+            gain = 1.0;
         }
     }

branches/simtest_nebulous_branches/ppSim/src/ppSimInsertGalaxies.c

@@ -74 +74 @@
     int dY = PM_CELL_TO_CHIP (0.0, y0Cell, yParityCell, binning);
 
-    // psMetadataLookupPtr (readout->analysis, "PSPHOT.SOURCES", 0);
-
-    psArray *sources = psArrayAllocEmpty (galaxies->n);
-
+    pmDetections *detections = psMetadataLookupPtr (&mdok, readout->analysis, "PSPHOT.DETECTIONS");
+    if (!detections) {
+        detections = pmDetectionsAlloc();
+        detections->allSources = psArrayAllocEmpty (galaxies->n);
+        psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_DATA_ARRAY | PS_META_REPLACE, "psphot detections", detections);
+    } else {
+        psMemIncrRefCounter (detections);
+    }
+    psArray *sources = sources = detections->allSources;
 
     // add sources to the readout image & weight
@@ -181 +186 @@
     }
 
-    // NOTE: readout must be part of the pmFPAfile named "PPSIM.OUTPUT"
-    // psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_DATA_ARRAY | PS_META_REPLACE, "psphot sources", sources);
+    // XXX many leaks in here, i think 
+    psFree (detections);
 
-    // XXX many leaks in here, i think 
     return true;
 }

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

branches/simtest_nebulous_branches/ppSim/src/ppSimLoadForceSources.c

@@ -102 +102 @@
         RESET(source->maskView);
         RESET(source->modelFlux);
-        RESET(source->psfFlux);
+        RESET(source->psfImage);
         RESET(source->blends);
 

branches/simtest_nebulous_branches/ppSim/src/ppSimLoadStars.c

@@ -30 +30 @@
     psRegion *bounds = ppSimFPABounds (fpa);
     float radius = 0.5 * PS_MAX(bounds->x1 - bounds->x0, bounds->y1 - bounds->y0) * scale;
-    psFree(bounds);
 
     float x0fpa = 0.5*(bounds->x0 + bounds->x1);
     float y0fpa = 0.5*(bounds->y0 + bounds->y1);
+
+    psFree(bounds);
 
     psMetadataAdd(astroRecipe, PS_LIST_TAIL, "RA_MIN",  PS_DATA_F32 | PS_META_REPLACE, "",
@@ -41 +42 @@
     psMetadataAdd(astroRecipe, PS_LIST_TAIL, "DEC_MIN", PS_DATA_F32 | PS_META_REPLACE, "", dec0 - radius);
     psMetadataAdd(astroRecipe, PS_LIST_TAIL, "DEC_MAX", PS_DATA_F32 | PS_META_REPLACE, "", dec0 + radius);
-    psArray *refStars = psastroLoadRefstars(config, "PSASTRO.INPUT");
+    psArray *refStars = psastroLoadRefstars(config, "PPSIM.OUTPUT");
     if (!refStars) {
         psError(PS_ERR_UNKNOWN, false, "Unable to find reference stars.");

branches/simtest_nebulous_branches/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
+
+    ppSimUpdateConceptsFPA (fpa, config);
+    if (fpa->hdu) { // XXX only do this if there is no INPUT image
+        if (!ppSimInitHeader(config, fpa, NULL, NULL)) ESCAPE (PS_ERR_UNKNOWN, "problem setting output header");
+    }
 
     psArray *stars = psArrayAllocEmpty (1);
@@ -43 +48 @@
         if (!ppSimMakeStars (stars, fpa, config, rng)) ESCAPE (PS_ERR_UNKNOWN, "failed to make random stars");
 
+        // Add random stars
+        if (!ppSimMakeStarGrid (stars, fpa, config, rng)) ESCAPE (PS_ERR_UNKNOWN, "failed to make random stars");
+
         // Add random galaxies
         if (!ppSimMakeGalaxies (galaxies, fpa, config, rng)) ESCAPE (PS_ERR_UNKNOWN, "failed to make random galaxies");
@@ -57 +65 @@
         psFree(view);
         return false;
-    }
-
-    ppSimUpdateConceptsFPA (fpa, config);
-    if (fpa->hdu) { // XXX only do this if there is no INPUT image
-        if (!ppSimInitHeader(config, fpa, NULL, NULL)) ESCAPE (PS_ERR_UNKNOWN, "problem setting output header");
     }
 

branches/simtest_nebulous_branches/ppSim/src/ppSimMakeStars.c

@@ -61 +61 @@
         if (!status) {
             refMag = brightMag;
-            refSum = 1;
+            refSum = starsDensity * xSize * ySize * PS_SQR(scale * 180.0 / M_PI);
         }
     } else {

branches/simtest_nebulous_branches/ppSim/src/ppSimPhotom.c

@@ -46 +46 @@
             if (! readout->data_exists) { continue; }
 
+// these are broken by the Jan 2010 API changes to psphot
+#if 0
             // run the actual photometry analysis
             if (!ppSimPhotomReadoutFake (config, view)) {
@@ -56 +58 @@
             }
             // ppSimDetectionLimits (config, view);
+#endif
         }
     }

branches/simtest_nebulous_branches/ppSim/src/ppSimPhotomReadout.c

@@ -6 +6 @@
     PS_ASSERT_PTR_NON_NULL (readout, NULL);
 
-    psArray *sources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.SOURCES");
+    pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
+    psAssert (detections, "missing detections?");
+
+    psArray *sources = detections->allSources;
     return sources;
 }
@@ -39 +42 @@
 # if 0    
     // set the photcode for this image
-    if (!psphotAddPhotcode (recipe, config, view, "PPSIM.CHIP")) {
+    if (!psphotAddPhotcodeReadout (recipe, config, view, "PPSIM.CHIP", 0)) {
         psError (PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
         return false;
@@ -74 +77 @@
 
     // Generate the mask and weight images, including the user-defined analysis region of interest
-    psphotSetMaskAndWeight (config, readout, recipe);
+    psphotSetMaskAndWeight (config, view, recipe);
 
     // load the psf model, if suppled.  FWHM_X,FWHM_Y,etc are saved in the recipe
@@ -85 +88 @@
 
     // generate a background model (median, smoothed image)
-    if (!psphotModelBackground (config, view, "PPSIM.CHIP")) {
+    if (!psphotModelBackgroundReadoutFileIndex (config, view, "PPSIM.CHIP", 0)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
-    if (!psphotSubtractBackground (config, view, "PPSIM.CHIP")) {
+    if (!psphotSubtractBackgroundReadout (config, view, "PPSIM.CHIP", 0)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
@@ -151 +154 @@
 
     // create the exported-metadata and free local data
-    // XXX this places the sources on readout->analysis as PSPHOT.SOURCES.  modify?
-    // (or don't supply the sources, and do this with a different function)
     psphotReadoutCleanup(config, readout, recipe, NULL, psf, NULL);
 
@@ -167 +168 @@
     psAssert (forceReadout, "no forceReadout?");
     pmChipSetDataStatus (forceChip, true);
-    psMetadataAddArray (forceReadout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_META_REPLACE, "forced photometry ", forceSources);
-    psFree (forceSources);
+
+    pmDetections *detectionsForce = pmDetectionsAlloc();
+    detectionForce->allSources = forceSources;
+
+    // save detections on the readout->analysis
+    if (!psMetadataAddPtr (readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_META_REPLACE | PS_DATA_UNKNOWN, "force sources", detectionsForce)) {
+        psError (PSPHOT_ERR_CONFIG, false, "problem saving detections on readout");
+        return false;
+    }
+    psFree(detectionsForce);
 
     pmCell    *fakeCell    = pmFPAfileThisCell (config->files, view, "PPSIM.FAKE.SOURCES"); psAssert (fakeCell, "no cell?");
@@ -179 +188 @@
     psAssert (fakeReadout, "no fakeReadout?");
     pmChipSetDataStatus (fakeChip, true);
-    psMetadataAddArray (fakeReadout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_META_REPLACE, "fake photometry ", fakeSources);
+
+    pmDetections *detectionsFake = pmDetectionsAlloc();
+    detectionFake->allSources = fakeSources;
+
+    // save detections on the readout->analysis
+    if (!psMetadataAddPtr (readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_META_REPLACE | PS_DATA_UNKNOWN, "fake sources", detectionsFake)) {
+        psError (PSPHOT_ERR_CONFIG, false, "problem saving detections on readout");
+        return false;
+    }
+    psFree(detectionsFake);
 
     return true;

branches/simtest_nebulous_branches/ppSim/src/ppSimPhotomReadoutFake.c

@@ -1 +1 @@
 # include "ppSim.h"
 
+// XXX this function is currently disabled -- need to update code below to distinguish the fake
+// and force positions, etc
 bool ppSimPhotomReadoutFake(pmConfig *config, const pmFPAview *view) {
 
@@ -11 +13 @@
         return false;
     }
-
-# if 0
-    // set the photcode for this image
-    if (!psphotAddPhotcode (recipe, config, view, "PPSIM.FAKE.CHIP")) {
-        psError (PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
-        return false;
-    }
-# endif
 
     // *** in this section, perform the photometry for real + fake sources on PPSIM.FAKE.CHIP ***
@@ -36 +30 @@
 
     // Generate the mask and variance images, including the user-defined analysis region of interest
-    psphotSetMaskAndVariance (config, readout, recipe);
+    psphotSetMaskAndVariance (config, view);
 
     // XXX need to define the source pixels
@@ -58 +52 @@
     // load the psf model, if suppled.  FWHM_X,FWHM_Y,etc are saved in the recipe
     // this function uses PSPHOT.PSF.LOAD as the pmFPAfile
-    pmPSF *psf = psphotLoadPSF (config, view, recipe);
-    assert (psf);
+    psphotLoadPSF (config, view);
 
     // remove all sources
@@ -65 +58 @@
 
     // generate a background model (median, smoothed image)
-    if (!psphotModelBackground (config, view, "PPSIM.FAKE.CHIP")) {
+    if (!psphotModelBackgroundReadoutFileIndex (config, view, "PPSIM.FAKE.CHIP", 0)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
-    if (!psphotSubtractBackground (config, view, "PPSIM.FAKE.CHIP")) {
+    if (!psphotSubtractBackgroundReadout (config, view, "PPSIM.FAKE.CHIP", 0, recipe)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
@@ -118 +111 @@
     psAssert (fakeReadout, "no fakeReadout?");
     pmChipSetDataStatus (fakeChip, true);
-    psMetadataAddArray (fakeReadout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_META_REPLACE, "fake photometry ", fakeSources);
+
+    pmDetections *detections = pmDetectionsAlloc();
+    detection->allSources = fakeSources;
+
+    psMetadataAddArray (fakeReadout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_META_REPLACE, "fake photometry ", detections);
+    psFree(detections);
 
     return true;

branches/simtest_nebulous_branches/ppSim/src/ppSimPhotomReadoutForce.c

@@ -14 +14 @@
 # if 0
     // set the photcode for this image
-    if (!psphotAddPhotcode (recipe, config, view, "PPSIM.FAKE.CHIP")) {
+    if (!psphotAddPhotcodeReadout (recipe, config, view, "PPSIM.FAKE.CHIP", 0)) {
         psError (PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
         return false;
@@ -36 +36 @@
 
     // Generate the mask and variance images, including the user-defined analysis region of interest
-    psphotSetMaskAndVariance (config, readout, recipe);
+    psphotSetMaskAndVariance (config, view, recipe);
 
     // XXX need to define the source pixels
@@ -58 +58 @@
 
     // generate a background model (median, smoothed image)
-    if (!psphotModelBackground (config, view, "PPSIM.FORCE.CHIP")) {
+    if (!psphotModelBackgroundReadoutFileIndex (config, view, "PPSIM.FORCE.CHIP", 0)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
-    if (!psphotSubtractBackground (config, view, "PPSIM.FORCE.CHIP")) {
+    if (!psphotSubtractBackgroundReadout (config, view, "PPSIM.FORCE.CHIP", 0)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
@@ -98 +98 @@
 
     // create the exported-metadata and free local data
-    // XXX this places the sources on readout->analysis as PSPHOT.SOURCES.  modify?
-    // (or don't supply the sources, and do this with a different function)
     psphotReadoutCleanup(config, readout, recipe, NULL, psf, NULL);
 
@@ -111 +109 @@
     psAssert (forceReadout, "no forceReadout?");
     pmChipSetDataStatus (forceChip, true);
-    psMetadataAddArray (forceReadout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_META_REPLACE, "force photometry ", forceSources);
+
+    pmDetections *detections = pmDetectionsAlloc();
+    detection->allSources = forceSources;
+    psMetadataAddArray (forceReadout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_META_REPLACE, "force photometry ", detections);
+    psFree(detections);
 
     return true;

branches/simtest_nebulous_branches/ppSim/src/ppSimSetPSF.c

@@ -20 +20 @@
     // ppSimArguments)
     float seeing   = psMetadataLookupF32(&status, recipe, "SEEING"); // Seeing SIGMA (pixels)
+    float aRatio   = psMetadataLookupF32(&status, recipe, "PSF.ARATIO"); // Seeing SIGMA (pixels)
+    float theta    = psMetadataLookupF32(&status, recipe, "PSF.THETA"); // Seeing SIGMA (pixels)
 
     char *psfModelName = psMetadataLookupStr(&status, recipe, "PSF.MODEL"); // Name of PSF model
@@ -55 +57 @@
     // supply the semi-major axis (these are SIGMA values in PIXELS)
     axes.major = seeing;
-    axes.minor = seeing;
-    axes.theta = 0.0;
+    axes.minor = aRatio * seeing;
+    axes.theta = theta * PS_RAD_DEG;
 
     pol = psEllipseAxesToPol (axes);

branches/simtest_nebulous_branches/ppSim/src/ppSimUtils.c

@@ -270 +270 @@
 psArray *ppSimSelectSources (pmConfig *config, const pmFPAview *view, const char *filename) {
 
+    bool status;
+
     pmReadout *readout = pmFPAfileThisReadout (config->files, view, filename);
     PS_ASSERT_PTR_NON_NULL (readout, NULL);
 
-    psArray *sources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.SOURCES");
+    pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
+    psAssert (detections, "missing detections?");
+
+    psArray *sources = detections->allSources;
     return sources;
 }