Changeset 14614

Timestamp:

Aug 22, 2007, 3:05:47 PM (19 years ago)

Author:

eugene

Message:

load / apply psf model from external source

Location:

branches/eam_branch_20070817/ppSim/src

Files:

• Makefile.am (modified) (1 diff)
• ppSim.c (modified) (2 diffs)
• ppSim.h (modified) (2 diffs)
• ppSimArguments.c (modified) (2 diffs)
• ppSimCreate.c (modified) (2 diffs)
• ppSimInsertSources.c (modified) (4 diffs)
• ppSimLoop.c (modified) (8 diffs)
• ppSimSetPSF.c (added)

branches/eam_branch_20070817/ppSim/src/Makefile.am

@@ -19 +19 @@
         ppSimBounds.c           \
         ppSimStars.c            \
+        ppSimSetPSF.c           \
         ppSimUtils.c            \
         ppSimLoop.c

branches/eam_branch_20070817/ppSim/src/ppSim.c

@@ -4 +4 @@
 {
     psLibInit(NULL);
+    if (!pmModelClassInit ()) abort();
+
     pmConfig *config = pmConfigRead(&argc, argv, NULL); // Configuration
     if (!config) {
@@ -18 +20 @@
     }
 
-    psExit loopError;
-    if ((loopError = ppSimLoop(config))) {
+    if (!ppSimLoop(config)) {
         psErrorStackPrint(stderr, "Unable to generate data.");
         psFree(config);
-        exit(loopError);
+        exit(PS_EXIT_SYS_ERROR);
     }
 

branches/eam_branch_20070817/ppSim/src/ppSim.h

@@ -72 +72 @@
 
 /// Loop over the output file, generating simulated data
-psExit ppSimLoop(pmConfig *config ///< Configuration
+bool ppSimLoop(pmConfig *config ///< Configuration
                  );
 
@@ -115 +115 @@
     );
 
+bool ppSimSetPSF (pmChip *chip, pmConfig *config);
+
 #endif

branches/eam_branch_20070817/ppSim/src/ppSimArguments.c

@@ -66 +66 @@
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-starsmag", 0, "Brightest magnitude for fake stars", NAN);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-starsdensity", 0, "Density of fake stars at magnitude", NAN);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-psfclass", 0, "Type of PSF model", NULL);
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-bin", 0, "Binning in x and y", 1);
 
@@ -194 +195 @@
         psMetadataAddF32(config->arguments, PS_LIST_TAIL, "PA", 0, "Boresight position angle (radians)",
                          pa * M_PI / 180.0);
+
+
+        const char *psfClass = psMetadataLookupStr(NULL, arguments, "-psfclass"); // Filter name
+        psMetadataAddStr(config->arguments, PS_LIST_TAIL, "PSF.MODEL", 0, "PSF model class", psfClass);
     }
 

branches/eam_branch_20070817/ppSim/src/ppSimCreate.c

@@ -1 +1 @@
 # include "ppSim.h"
+
+// XXX this function forces us to define the camera (on the command line) and format (via the
+// PPSIM.OUTPUT entry).  In this case, we need to set config->format,formatName based on these
+// values.  This will be a problem when we want to load an input image (in order to add fake
+// stars).  We will need to add some logic in ppSimArguments to distinguish the cases of 1)
+// input image and 2) specified camera
 
 pmFPAfile *ppSimCreate(pmConfig *config)
@@ -25 +31 @@
     file->save = true;
 
+    config->format = psMemIncrRefCounter (file->format);
+    config->formatName = psStringCopy (file->formatName);
+
     // have we supplied a psf model?
     if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.PSF")) {
         bool status = false;
+
+        // tie the psf file to the chipMosaic 
         pmFPAfileBindFromArgs(&status, file, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");
         if (!status) {

branches/eam_branch_20070817/ppSim/src/ppSimInsertSources.c

@@ -3 +3 @@
 bool ppSimInsertSources (pmReadout *readout, psImage *expCorr, psArray *stars, pmConfig *config) {
 
+    bool mdok;
 
     assert (stars);
+    assert (readout);
     
     pmCell *cell = readout->parent;
     pmChip *chip = cell->parent;
 
-    // XXX we probably need this to get the size right
-# if (0)
-    bool mdok;
+    // XXX this is an estimate of the sky noise based on the inputs to the image simulation.
+    // XXX update this to allow the estimate based on the measured sky background
+    // XXX this is missing the gain.
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSIM_RECIPE); // Recipe
 
@@ -29 +31 @@
     // Rough noise estimate, appropriate for entire cell (use for source radius?)
     float roughNoise = sqrtf(PS_SQR(readnoise) + (darkRate + skyRate) * expTime);
-# endif
 
     int x0Chip = psMetadataLookupS32(NULL, chip->concepts, "CHIP.X0");
@@ -43 +44 @@
     int binning = psMetadataLookupS32(NULL, config->arguments, "BINNING"); // Binning in x and y
 
-    pmPSF *psf = psMetadataLookupPtr (NULL, chip->analysis, "PSF");
+    pmPSF *psf = psMetadataLookupPtr (&mdok, chip->analysis, "PSPHOT.PSF");
+    assert (psf);
 
     int dX = PM_CELL_TO_CHIP (0.0, x0Cell, xParityCell, binning);
@@ -74 +76 @@
         pmModelSetFlux (model, star->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);
+        radius = PS_MAX (radius, 1.0);
+
         // construct a source, with model flux pixels set, based on the model
-        pmSource *source = pmSourceFromModel (model, readout, PM_SOURCE_TYPE_STAR);
+        pmSource *source = pmSourceFromModel (model, readout, radius, PM_SOURCE_TYPE_STAR);
 
         // XXX add the sources to a source array
 
+        // insert the source flux in the image
         pmSourceAddWithOffset (source, PM_MODEL_OP_FULL, 0xff, dX, dY);
     }

branches/eam_branch_20070817/ppSim/src/ppSimLoop.c

@@ -1 +1 @@
 #include "ppSim.h"
 
-psExit ppSimLoop(pmConfig *config)
+bool ppSimLoop(pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, PS_EXIT_PROG_ERROR);
@@ -48 +48 @@
         }
 
-        // XXX check for a supplied PSF, otherwise generate a basic one
         if (type == PPSIM_TYPE_OBJECT) {
-            // XXX TBD : ppSimSetPSF (chip, config);
+            if (!ppSimSetPSF (chip, config)) {
+                psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d in ppSim\n", view->chip);
+                psFree (view);
+                return false;
+            }
         }
 
@@ -64 +67 @@
                 psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CELL.READDIR = 1 is the only supported mode.");
                 psFree(rng);
-                return PS_EXIT_CONFIG_ERROR;
+                return false;
             }
 
@@ -90 +93 @@
                 ppSimMakeSky (readout, expCorr, type, config);
                 if (type == PPSIM_TYPE_FLAT) goto done;
-
-                // if (type == PPSIM_TYPE_OBJECT) {
-                // ppSimInsertStars (readout, expCorr, stars, config, chip, cell);
-                // }
 
                 if (type == PPSIM_TYPE_OBJECT) {
@@ -123 +122 @@
                 psFree(rng);
                 psFree(view);
-                return PS_EXIT_SYS_ERROR;
+                // return PS_EXIT_SYS_ERROR;
+                return false;
             }
         }
@@ -135 +135 @@
             psFree(rng);
             psFree(view);
-            return PS_EXIT_SYS_ERROR;
+            // return PS_EXIT_SYS_ERROR;
+            return false;
         }
 
@@ -148 +149 @@
         psFree(rng);
         psFree(view);
-        return PS_EXIT_SYS_ERROR;
+        // return PS_EXIT_SYS_ERROR;
+        return false;
     }
 
@@ -154 +156 @@
     psFree(view);
 
-    return 0;
+    return true;
 }