Changeset 14547 for branches/eam_branch_20070817/ppSim/src/ppSimLoop.c

Timestamp:

Aug 19, 2007, 4:21:10 PM (19 years ago)

Author:

eugene

Message:

convert ppSimLoop to use pmReadout, loading psf model, add sources based on psf model

File:

• branches/eam_branch_20070817/ppSim/src/ppSimLoop.c (modified) (4 diffs)

branches/eam_branch_20070817/ppSim/src/ppSimLoop.c

@@ -31 +31 @@
     // load any needed files (eg, input image, PSF)
     if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) {
-        psError(PSPHOT_ERR_DATA, false, "failed IO for fpa in ppSim\n");
+        psError(PS_ERR_UNKNOWN, false, "failed IO for fpa in ppSim\n");
         psFree(view);
         return false;
@@ -43 +43 @@
         // load any needed files (eg, input image, PSF)
         if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) {
-            psError(PSPHOT_ERR_DATA, false, "failed IO for chip %d in ppSim\n", view->chip);
+            psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d in ppSim\n", view->chip);
             psFree (view);
             return false;
         }
 
-        pmPSF *psf = NULL;
+        // XXX check for a supplied PSF, otherwise generate a basic one
         if (type == PPSIM_TYPE_OBJECT) {
-            psf = ppSimSetPSF (config);
+            // XXX TBD : ppSimSetPSF (chip, config);
         }
 
@@ -74 +74 @@
 
                 // TO DO: Decide if cell is to be windowed, reduce numCols, numRows appropriately
-                psImage *signal = psImageAlloc(numCols, numRows, PS_TYPE_F32); // Signal in pixels
-                psImage *variance = psImageAlloc(numCols, numRows, PS_TYPE_F32); // Noise in pixels
+                readout->image = psImageAlloc(numCols, numRows, PS_TYPE_F32); // Signal in pixels
+                readout->weight = psImageAlloc(numCols, numRows, PS_TYPE_F32); // Noise in pixels
 
                 psImage *expCorr = NULL; // Exposure correction per pixel, for adding objects
@@ -82 +82 @@
                 }
 
-                psVector *biasRows = ppSimMakeBias (signal, variance, cell, config, rng);
+                psVector *biasRows = ppSimMakeBias (readout, config, rng);
                 if (type == PPSIM_TYPE_BIAS) goto done;
                 
-                ppSimMakeDark (signal, variance, config);
+                ppSimMakeDark (readout, config);
                 if (type == PPSIM_TYPE_DARK) goto done;
 
-                ppSimMakeSky (signal, variance, expCorr, type, config, fpa, chip, cell);
+                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) {
-                    ppSimInsertStars (signal, variance, expCorr, stars, config, chip, cell);
+                    ppSimInsertSources (readout, expCorr, stars, config);
                 }
 
             done:
-                ppSimAddNoise(signal, variance, config, cell, rng);
-                ppSimSaturate(signal, config, cell);
-
-                readout->image = signal;
-                psFree(variance);
-                psFree(expCorr);
+                ppSimAddNoise(readout->image, readout->weight, cell, config, rng);
+                ppSimSaturate(readout, config);
 
                 ppSimAddOverscan (readout, config, biasCols, biasRows, rng);