Changeset 21365 for trunk/ppSim/src/ppSimMakeDark.c

Timestamp:

Feb 5, 2009, 4:47:00 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

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

trunk/ppSim/src/ppSimMakeDark.c

@@ -7 +7 @@
 
     psImage *signal = readout->image;
-    psImage *variance = readout->weight;
+    psImage *variance = readout->variance;
 
     psMetadata *recipe = psMetadataLookupMetadata(&mdok, config->recipes, PPSIM_RECIPE); // Recipe
@@ -29 +29 @@
 
     for (int y = 0; y < signal->numRows; y++) {
-        for (int x = 0; x < signal->numCols; x++) {
-                        
-            // Dark current
-            float darkCurrent = darkRate * expTime; // Dark current accumulated
-            signal->data.F32[y][x] += darkCurrent;
-            variance->data.F32[y][x] += darkCurrent;
-        }
+        for (int x = 0; x < signal->numCols; x++) {
+
+            // Dark current
+            float darkCurrent = darkRate * expTime; // Dark current accumulated
+            signal->data.F32[y][x] += darkCurrent;
+            variance->data.F32[y][x] += darkCurrent;
+        }
     }
     return true;