Changeset 26374

Timestamp:

Dec 8, 2009, 7:11:15 PM (16 years ago)

Author:

eugene

Message:

add an option for a grid of stars

Location:

branches/eam_branches/20091201/ppSim/src

Files:

• Makefile.am (modified) (1 diff)
• ppSim.h (modified) (1 diff)
• ppSimAddNoise.c (modified) (1 diff)
• ppSimLoop.c (modified) (1 diff)
• ppSimSetPSF.c (modified) (2 diffs)

branches/eam_branches/20091201/ppSim/src/Makefile.am

@@ -30 +30 @@
         ppSimLoadStars.c          \
         ppSimMakeStars.c          \
+        ppSimMakeStarGrid.c       \
         ppSimMakeGalaxies.c       \
         ppSimMakeBiassec.c        \

branches/eam_branches/20091201/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/eam_branches/20091201/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/eam_branches/20091201/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

branches/eam_branches/20091201/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);