Changeset 26900

Timestamp:

Feb 10, 2010, 7:42:33 PM (16 years ago)

Author:

eugene

Message:

updates from eam_branches/20091201

Location:

trunk/ppSim/src

Files:

• Makefile.am (modified) (3 diffs)
• ppSim.h (modified) (1 diff)
• ppSimAddNoise.c (modified) (1 diff)
• ppSimInsertStars.c (modified) (2 diffs)
• ppSimLoop.c (modified) (1 diff)
• ppSimMakeStarGrid.c (copied) (copied from branches/eam_branches/20091201/ppSim/src/ppSimMakeStarGrid.c )
• ppSimPhotom.c (modified) (2 diffs)
• ppSimPhotomReadout.c (modified) (3 diffs)
• ppSimPhotomReadoutFake.c (modified) (5 diffs)
• ppSimPhotomReadoutForce.c (modified) (3 diffs)
• ppSimSetPSF.c (modified) (2 diffs)

trunk/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)

trunk/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);
 

trunk/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;
         }
     }

trunk/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);
 

trunk/ppSim/src/ppSimLoop.c

@@ -47 +47 @@
         // Add random stars
         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

trunk/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
         }
     }

trunk/ppSim/src/ppSimPhotomReadout.c

@@ -39 +39 @@
 # 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 +74 @@
 
     // 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 +85 @@
 
     // 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);
     }

trunk/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);
     }

trunk/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);
     }

trunk/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);