Changeset 10247 for trunk/psModules/src/camera/pmFPAMaskWeight.c

Timestamp:

Nov 28, 2006, 3:26:24 PM (19 years ago)

Author:

Paul Price

Message:

Generate poisson weights only if requested.

File:

• trunk/psModules/src/camera/pmFPAMaskWeight.c (modified) (7 diffs)

trunk/psModules/src/camera/pmFPAMaskWeight.c

@@ -188 +188 @@
 }
 
-bool pmReadoutSetWeight(pmReadout *readout)
+bool pmReadoutSetWeight(pmReadout *readout, bool poisson)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -207 +207 @@
     }
 
-    if (gain > 0.0) {
+    if (poisson) {
         // Set weight image to the variance in ADU = f/g + rn^2
         psImage *image = readout->image;    // The image pixels
@@ -217 +217 @@
                                                psScalarAlloc(1, PS_TYPE_F32));
     } else {
-        // Gain is negative or zero --- just use the read noise
+        // Just use the read noise
         if (!readout->weight) {
             readout->weight = psImageAlloc(readout->image->numCols, readout->image->numRows, PS_TYPE_F32);
@@ -230 +230 @@
 }
 
-bool pmReadoutGenerateWeight(pmReadout *readout)
+bool pmReadoutGenerateWeight(pmReadout *readout, bool poisson)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -273 +273 @@
     }
 
-    return pmReadoutSetWeight(readout);
-}
-
-bool pmReadoutGenerateMaskWeight(pmReadout *readout)
+    return pmReadoutSetWeight(readout, poisson);
+}
+
+bool pmReadoutGenerateMaskWeight(pmReadout *readout, bool poisson)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -283 +283 @@
 
     success |= pmReadoutGenerateMask(readout);
-    success |= pmReadoutGenerateWeight(readout);
+    success |= pmReadoutGenerateWeight(readout, poisson);
 
     return success;
 }
 
-bool pmCellGenerateMaskWeight(pmCell *cell)
+bool pmCellGenerateMaskWeight(pmCell *cell, bool poisson)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
@@ -296 +296 @@
     for (int i = 0; i < readouts->n; i++) {
         pmReadout *readout = readouts->data[i]; // The readout
-        pmReadoutGenerateMaskWeight(readout);
+        pmReadoutGenerateMaskWeight(readout, poisson);
     }