Changeset 14816 for trunk/ppSim/src/ppSimMakeSky.c

Timestamp:

Sep 11, 2007, 1:01:03 PM (19 years ago)

Author:

Paul Price

Message:

Ensuring consistency between flux scales (peak vs integrated) --- stars now appear on the output image! Some memory fixing too.

File:

• trunk/ppSim/src/ppSimMakeSky.c (modified) (2 diffs)

trunk/ppSim/src/ppSimMakeSky.c

@@ -8 +8 @@
 
     pmCell *cell = readout->parent;
-    pmChip *chip = cell->parent; 
+    pmChip *chip = cell->parent;
     pmFPA  *fpa  = chip->parent;
 
@@ -38 +38 @@
     for (int y = 0; y < signal->numRows; y++) {
 
-        float yFPA = PPSIM_CELL_TO_FPA(y, y0Cell, yParityCell, binning, y0Chip, yParityChip) * 2.0 /
-            (bounds->y1 - bounds->y0); // Relative y position in FPA
+        float yFPA = PPSIM_CELL_TO_FPA(y, y0Cell, yParityCell, binning, y0Chip, yParityChip) * 2.0 /
+            (bounds->y1 - bounds->y0); // Relative y position in FPA
 
-        for (int x = 0; x < signal->numCols; x++) {
-            float xFPA = PPSIM_CELL_TO_FPA(x, x0Cell, xParityCell, binning, x0Chip, xParityChip) * 2.0 /
-                (bounds->x1 - bounds->x0); // Relative x position in FPA
+        for (int x = 0; x < signal->numCols; x++) {
+            float xFPA = PPSIM_CELL_TO_FPA(x, x0Cell, xParityCell, binning, x0Chip, xParityChip) * 2.0 /
+                (bounds->x1 - bounds->x0); // Relative x position in FPA
 
-            // Shutter: adjust exposure time
-            float realExpTime = expTime + shutterTime * (xFPA + yFPA + 2.0) / 4.0;
+            // Shutter: adjust exposure time
+            float realExpTime = expTime + shutterTime * (xFPA + yFPA + 2.0) / 4.0;
 
-            // Gaussian flat-field over the FPA
-            float flatValue = exp(-0.5 / PS_SQR(flatSigma) *
-                                  (PS_SQR(yFPA) + PS_SQR(xFPA))) / flatSigma / sqrt(M_PI);
+            // 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);
 
-            if (type == PPSIM_TYPE_FLAT) {
-                float flatFlux = flatRate * flatValue * realExpTime; // Flux from flat-field
-                signal->data.F32[y][x] += flatFlux;
-                variance->data.F32[y][x] += flatFlux;
-                continue;
-            }
+            if (type == PPSIM_TYPE_FLAT) {
+                float flatFlux = flatRate * flatValue * realExpTime; // Flux from flat-field
+                signal->data.F32[y][x] += flatFlux;
+                variance->data.F32[y][x] += flatFlux;
+                continue;
+            }
 
-            expCorr->data.F32[y][x] = flatValue * realExpTime / expTime;
+            expCorr->data.F32[y][x] = realExpTime / expTime;
 
-            // Sky background
-            float skyFlux = skyRate * flatValue * realExpTime; // Flux from sky
-            signal->data.F32[y][x] += skyFlux;
-            variance->data.F32[y][x] += skyFlux;
+            // Sky background
+            float skyFlux = skyRate * flatValue * realExpTime; // Flux from sky
+            signal->data.F32[y][x] += skyFlux;
+            variance->data.F32[y][x] += skyFlux;
 
-            // TO DO: Add fringes
+            // TO DO: Add fringes
 
-        }
+        }
     }
     psFree(bounds);