Changeset 6887 for trunk/stac/src/stacErrorImages.c

Timestamp:

Apr 18, 2006, 12:20:45 PM (20 years ago)

Author:

Paul Price

Message:

Updating to use psLib rel11. Main problem was that vector and array lengths ('n' element) are no longer set to equal the number of allocated values ('nalloc' element) when allocated.

File:

• trunk/stac/src/stacErrorImages.c (modified) (2 diffs)

trunk/stac/src/stacErrorImages.c

@@ -4 +4 @@
 
 psArray *stacErrorImages(psArray *inputs, // Array of input images
-                         float gain,    // Gain, in e/ADU
-                         float rn       // Read noise, in e
+                         float gain,    // Gain, in e/ADU
+                         float rn       // Read noise, in e
     )
 {
-    float invGain = 1.0/gain;           // Inverse square root of gain
-    rn /= gain;                         // Read noise in ADU
+    float invGain = 1.0/gain;           // Inverse square root of gain
+    rn /= gain;                         // Read noise in ADU
     psArray *errors = psArrayAlloc(inputs->n);
+    errors->n = inputs->n;
 
     psTrace("stac.errors", 1, "Calculating error images....\n");
@@ -16 +17 @@
     // Iterate over the input images
     for (int i = 0; i < inputs->n; i++) {
-        psTrace("stac.errors",5,"Working on image #%d\n",i);
+        psTrace("stac.errors",5,"Working on image #%d\n",i);
 
-        psImage *image = inputs->data[i]; // Pull out the image of interest
-        int numRows = image->numRows;   // Number of rows
-        int numCols = image->numCols;   // Number of columns    
-        psImage *error = psImageAlloc(numCols, numRows, PS_TYPE_F32); // The error image
+        psImage *image = inputs->data[i]; // Pull out the image of interest
+        int numRows = image->numRows;   // Number of rows
+        int numCols = image->numCols;   // Number of columns
+        psImage *error = psImageAlloc(numCols, numRows, PS_TYPE_F32); // The error image
 
-        // Iterate over the pixels
-        for (int r = 0; r < numRows; r++) {
-            for (int c = 0; c < numCols; c++) {
-                // We actually calculate the variance
-                error->data.F32[r][c] = image->data.F32[r][c]*invGain + rn*rn;
-            }
-        }
+        // Iterate over the pixels
+        for (int r = 0; r < numRows; r++) {
+            for (int c = 0; c < numCols; c++) {
+                // We actually calculate the variance
+                error->data.F32[r][c] = image->data.F32[r][c]*invGain + rn*rn;
+            }
+        }
 
-        // Put image onto the array
-        errors->data[i] = error;
+        // Put image onto the array
+        errors->data[i] = error;
     }