Changeset 17705

Timestamp:

May 15, 2008, 4:44:46 PM (18 years ago)

Author:

eugene

Message:

options to turn on and off all of the components

Location:

branches/eam_branch_20080511/ppSim/src

Files:

• Makefile.am (modified) (1 diff)
• ppSim.c (modified) (2 diffs)
• ppSim.h (modified) (1 diff)
• ppSimAddNoise.c (modified) (2 diffs)
• ppSimAddOverscan.c (modified) (1 diff)
• ppSimArguments.c (modified) (5 diffs)
• ppSimCreate.c (modified) (2 diffs)
• ppSimInsertStars.c (modified) (1 diff)
• ppSimLoop.c (modified) (1 diff)
• ppSimMakeBiassec.c (modified) (1 diff)
• ppSimMakeSky.c (modified) (4 diffs)
• ppSimRandomGaussian.c (added)

branches/eam_branch_20080511/ppSim/src/Makefile.am

@@ -28 +28 @@
         ppSimMergeReadouts.c    \
         ppSimMosaicChip.c       \
+        ppSimRandomGaussian.c   \
         ppSimBadPixels.c
 

branches/eam_branch_20080511/ppSim/src/ppSim.c

@@ -2 +2 @@
 
 int failure (pmConfig *config, psExit status, char *message) { 
+    ppSimRandomGaussianFree ();
     psErrorStackPrint(stderr, message);
     psFree(config);
@@ -31 +32 @@
     }
 
+    ppSimRandomGaussianFree ();
     psFree(config);
     pmModelClassCleanup();

branches/eam_branch_20080511/ppSim/src/ppSim.h

@@ -176 +176 @@
 bool ppSimMergeReadouts (pmReadout *outReadout, pmReadout *inReadout);
 
+double ppSimRandomGaussian (const psRandom *rnd, double mean, double sigma);
+double ppSimRandomGaussianNorm (const psRandom *rnd);
+void ppSimRandomGaussianFree();
+
 #endif

branches/eam_branch_20080511/ppSim/src/ppSimAddNoise.c

@@ -32 +32 @@
             // (generate a static array with the cumulative distribution, use the
             // random number to select a bin from the histogram)
-            signal->data.F32[y][x] += sqrtf(variance->data.F32[y][x]) * psRandomGaussian(rng);
+            signal->data.F32[y][x] += sqrtf(variance->data.F32[y][x]) * ppSimRandomGaussianNorm(rng);
             signal->data.F32[y][x] /= gain; // Converting to ADU
         }
@@ -40 +40 @@
     return true;
 }
+

branches/eam_branch_20080511/ppSim/src/ppSimAddOverscan.c

@@ -7 +7 @@
     // skip this step if we did not generate a bias level
     if (biasCols == NULL) return true;
+    if (biasRows == NULL) return true;
 
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSIM_RECIPE); // Recipe

branches/eam_branch_20080511/ppSim/src/ppSimArguments.c

@@ -22 +22 @@
 {
     bool status;
-    bool mdok;                          // Status of MD lookup
 
     assert(config);
@@ -154 +153 @@
     ppSimType type = ppSimTypeFromString (typeStr);
 
-    char *filter = ppSimArgToRecipeStr(&status, options, "FILTER", arguments, "-filter"); // Filter name
+    ppSimArgToRecipeStr(&status, options, "FILTER", arguments, "-filter"); // Filter name
 
     // set the exposure time 
@@ -178 +177 @@
     ppSimArgToRecipeS32(&status, options, "BINNING",       arguments, "-bin");
 
-    // XX don't do this: recipe is not yet fully realized (camera options not interpolated)
-    psMetadata *recipe = psMetadataLookupMetadata(&mdok, config->recipes, PPSIM_RECIPE); // Recipe
-
     if (type == PPSIM_TYPE_OBJECT) {
         // Load values required for adding stars
@@ -195 +191 @@
         }
 
-        float scale = ppSimArgToRecipeF32(&status, options, "PIXEL.SCALE", arguments, "-scale"); // Plate scale
+        ppSimArgToRecipeF32(&status, options, "PIXEL.SCALE", arguments, "-scale"); // Plate scale (arcsec / pixel)
         ppSimArgToRecipeF32(&status, options, "SKY.MAGS", arguments, "-skymags"); // Plate scale
         ppSimArgToRecipeStr(&status, options, "PSF.MODEL",    arguments, "-psfclass"); // PSF model class
@@ -201 +197 @@
 
         // the user supplies FWHM in arcsec; here we convert to Sigma in pixels
-        psMetadataAddF32(options, PS_LIST_TAIL, "SEEING", 0, "Seeing SIGMA (pixels)", seeing / 2.0 / sqrt(2.0 * log(2.0)) / scale);
+        psMetadataAddF32(options, PS_LIST_TAIL, "SEEING", 0, "Seeing FWHM (arcsec)", seeing);
         psMetadataAddF32(options, PS_LIST_TAIL, "RA", 0, "Boresight RA (radians)", ra0 * M_PI / 180.0);
         psMetadataAddF32(options, PS_LIST_TAIL, "DEC", 0, "Boresight Declination (radians)", dec0 * M_PI / 180.0);
         psMetadataAddF32(options, PS_LIST_TAIL, "PA", 0, "Boresight position angle (radians)",pa * M_PI / 180.0);
 
-        assert (filter != NULL);
-
         ppSimArgToRecipeF32(&status, options, "ZEROPOINT", arguments, "-zp"); // Zero point
-        if (!status) {
-            float zp = ppSimGetZeroPoint (recipe, filter);
-            psMetadataAddF32(options, PS_LIST_TAIL, "ZEROPOINT", 0, "Photometric zeropoint", zp);
-        }
     }
 

branches/eam_branch_20080511/ppSim/src/ppSimCreate.c

@@ -53 +53 @@
     config->formatName = psStringCopy (output->formatName);
 
+    // the recipe is now fully realized for the desired camera
     psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, PPSIM_RECIPE); // Recipe
+
+    char *typeStr = psMetadataLookupStr(NULL, recipe, "IMAGE.TYPE"); // Type of image to simulate
+    ppSimType type = ppSimTypeFromString (typeStr); // Type of image to simulate
+
+    if (type == PPSIM_TYPE_OBJECT) {
+        // adjust the seeing by the scale
+        float seeing = psMetadataLookupF32(&status, recipe, "SEEING");
+        if (isnan(seeing)) {
+            psError(PS_ERR_BAD_PARAMETER_TYPE, true, "seeing is not defined");
+            psFree(fpa);
+            return NULL;
+        }
+        float scale = psMetadataLookupF32(&status, recipe, "PIXEL.SCALE");
+        if (isnan(scale)) {
+            psError(PS_ERR_BAD_PARAMETER_TYPE, true, "pixel scale is not defined");
+            psFree(fpa);
+            return NULL;
+        }
+        psMetadataAddF32(recipe, PS_LIST_TAIL, "SEEING", PS_META_REPLACE, "Seeing SIGMA (pixels)", seeing / 2.0 / sqrt(2.0 * log(2.0)) / scale);
+    }
+
+    if ((type == PPSIM_TYPE_OBJECT) || (type == PPSIM_TYPE_FLAT)) {
+        // determine the zeropoint from the filter
+        float zp = psMetadataLookupF32(&status, recipe, "ZEROPOINT");
+        if (isnan(zp)) {
+            char *filter = psMetadataLookupStr(&status, recipe, "FILTER");
+            float zp = ppSimGetZeroPoint (recipe, filter);
+            psMetadataAddF32(recipe, PS_LIST_TAIL, "ZEROPOINT", PS_META_REPLACE, "Photometric zeropoint", zp);
+        }
+    }
 
     // For photometry, we operate on the chip-mosaicked image.  we create a copy of the mosaicked
@@ -115 +146 @@
         psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, PPSIM_RECIPE); // Recipe
 
-        ppSimArgToRecipeF32(&status, recipe, "EXPTIME", fpa->concepts, "FPA.EXPOSURE");
-        char *filter = ppSimArgToRecipeStr(&status, recipe, "FILTER", fpa->concepts, "FPA.FILTER");
+        ppSimArgToRecipeF32(&status, recipe, "EXPTIME", input->fpa->concepts, "FPA.EXPOSURE");
+        char *filter = ppSimArgToRecipeStr(&status, recipe, "FILTER", input->fpa->concepts, "FPA.FILTER");
 
         float zp = ppSimGetZeroPoint (recipe, filter);

branches/eam_branch_20080511/ppSim/src/ppSimInsertStars.c

@@ -121 +121 @@
         // insert the source flux in the image
         pmSourceAddWithOffset (source, PM_MODEL_OP_FULL, 0xff, dX, dY);
+        pmSourceAddWithOffset (source, PM_MODEL_OP_FULL | PM_MODEL_OP_NOISE, 0xff, dX, dY);
         psArrayAdd (sources, 100,source);
         psFree(source);                 // Drop reference

branches/eam_branch_20080511/ppSim/src/ppSimLoop.c

@@ -170 +170 @@
 
                 if (inputCell && inputCell->readouts->data[i]) {
-                    if (!ppSimMergeReadouts (readout, inputCell->readouts->data[i])) ESCAPE (PS_ERR_UNKNOWN, "problem merging input image with simulated image");
+                    pmReadout *inReadout = inputCell->readouts->data[i];
+                    if (!inReadout->weight) {
+                        if (!pmReadoutGenerateWeight(inReadout, true)) {
+                            psError (PS_ERR_UNKNOWN, false, "trouble creating weight");
+                            return false;
+                        }
+                    }
+                    if (!ppSimMergeReadouts (readout, inReadout)) ESCAPE (PS_ERR_UNKNOWN, "problem merging input image with simulated image");
                 }
             }

branches/eam_branch_20080511/ppSim/src/ppSimMakeBiassec.c

@@ -6 +6 @@
 
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSIM_RECIPE); // Recipe
+
+    bool bias = psMetadataLookupBool(&mdok, recipe, "BIAS"); // Generate a Bias?
+    if (!bias) return NULL;
 
     psList *biassec = psMetadataLookupPtr(NULL, cell->concepts, "CELL.BIASSEC"); // Bias regions

branches/eam_branch_20080511/ppSim/src/ppSimMakeSky.c

@@ -17 +17 @@
     psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, PPSIM_RECIPE); // Recipe
 
-    bool sky = psMetadataLookupBool(&status, recipe, "SKY"); // Generate a SKY flux?
+    bool sky  = psMetadataLookupBool(&status, recipe, "SKY"); // Generate a SKY flux?
+    bool flat = psMetadataLookupBool(&status, recipe, "FLAT"); // Apply flat-field term?
  
     float expTime      = psMetadataLookupF32(&status, recipe, "EXPTIME"); // Exposure time
@@ -24 +25 @@
     float flatRate     = psMetadataLookupF32(&status, recipe, "FLAT.RATE"); // Flat-field rate
     float shutterTime  = psMetadataLookupF32(&status, recipe, "SHUTTER.TIME"); // Shutter time
-    float scatterScale = psMetadataLookupF32(&status, recipe, "SCATTER.SCALE"); // scattered light term
+    float scatterFrac  = psMetadataLookupF32(&status, recipe, "SCATTER.FRAC"); // scattered light fraction (max)
     float skyRate      = psMetadataLookupF32(&status, recipe, "SKY.RATE"); // Sky rate
-    if (isnan(skyRate)) {
+    float skyMags      = psMetadataLookupF32(&status, recipe, "SKY.MAGS");  assert (status);
+    if (!isnan(skyMags)) {
         float zp       = psMetadataLookupF32(&status, recipe, "ZEROPOINT"); assert (status);
         float scale    = psMetadataLookupF32(&status, recipe, "PIXEL.SCALE"); assert (status);
-        float skyMags  = psMetadataLookupF32(&status, recipe, "SKY.MAGS");  assert (status);
         skyRate = scale * scale * ppSimMagToFlux (skyMags, zp);
     }
@@ -69 +70 @@
             float realExpTime = expTime + shutterTime * (xFPA + yFPA + 2.0) / 4.0;
 
-            // Gaussian flat-field over the FPA
-            float flatValue = expf(-0.5 / PS_SQR(flatSigma) * (PS_SQR(yFPA) + PS_SQR(xFPA))) / flatSigma / sqrtf(2.0 * M_PI);
+            // Gaussian flat-field over the FPA with flatValue = 1.0 at the field center
+            float flatValue = 1.0;
+            if (flat) {
+                // we make the flat-field have a response of 1.0 at the field center (like a vignetting)
+                flatValue = expf(-0.5 / PS_SQR(flatSigma) * (PS_SQR(yFPA) + PS_SQR(xFPA)));
+            }
 
             float scatterRate = 0.0;
@@ -78 +83 @@
               if (type == PPSIM_TYPE_FLAT) {
                 float xF = 2.0*(xFPA / dXfpa) - 1.0;
-                scatterRate = scatterScale * PS_SQR(xF);
+                scatterRate = scatterFrac * PS_SQR(xF);
               }
 
               // Sky background
-              float skyFlux = (skyRate * flatValue + scatterRate) * realExpTime; // Flux from sky
+              float skyFlux = (skyRate * (flatValue + scatterRate)) * realExpTime; // Flux from sky
               signal->data.F32[y][x] += skyFlux;
               variance->data.F32[y][x] += skyFlux;