Changeset 21365 for trunk/ppSim/src/ppSimMakeBias.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/ppSimMakeBias.c (modified) (3 diffs)

trunk/ppSim/src/ppSimMakeBias.c

@@ -20 +20 @@
     float readnoise = psMetadataLookupF32(NULL, cell->concepts, "CELL.READNOISE");// CCD read noise, e
     if (isnan(readnoise)) {
-        psWarning("CELL.READNOISE is not set; reverting to recipe value READNOISE.");
-        readnoise = psMetadataLookupF32(&mdok, recipe, "READNOISE");
-        if (!mdok) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Unable to find READNOISE in recipe.");
-            *status = false;
-            return NULL;
-        }
+        psWarning("CELL.READNOISE is not set; reverting to recipe value READNOISE.");
+        readnoise = psMetadataLookupF32(&mdok, recipe, "READNOISE");
+        if (!mdok) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Unable to find READNOISE in recipe.");
+            *status = false;
+            return NULL;
+        }
     }
 
     psImage *signal = readout->image;
-    psImage *variance = readout->weight;
+    psImage *variance = readout->variance;
 
     int numRows = signal->numRows;
@@ -38 +38 @@
     psPolynomial1D *biasPoly = psPolynomial1DAlloc(PS_POLYNOMIAL_CHEB, biasOrder);
     for (int j = 0; j < biasOrder + 1; j++) {
-        biasPoly->coeff[j] = biasRange * psRandomGaussian(rng);
+        biasPoly->coeff[j] = biasRange * psRandomGaussian(rng);
     }
 
@@ -45 +45 @@
 
     for (int y = 0; y < numRows; y++) {
-        // Adjust bias level for this row
-        biasRows->data.F32[y] = psPolynomial1DEval(biasPoly, (float)(y + biasOffset) /
-                                                  (float)numRows - 0.5) + biasLevel;
+        // Adjust bias level for this row
+        biasRows->data.F32[y] = psPolynomial1DEval(biasPoly, (float)(y + biasOffset) /
+                                                  (float)numRows - 0.5) + biasLevel;
 
-        for (int x = 0; x < numCols; x++) {
+        for (int x = 0; x < numCols; x++) {
 
-            // Bias level
-            signal->data.F32[y][x] += biasRows->data.F32[y];
-            variance->data.F32[y][x] += PS_SQR(readnoise);
+            // Bias level
+            signal->data.F32[y][x] += biasRows->data.F32[y];
+            variance->data.F32[y][x] += PS_SQR(readnoise);
 
-        }
+        }
     }
     psFree(biasPoly);