Changeset 27412 for branches/pap_stack/psModules/src/imcombine/pmStack.c

Timestamp:

Mar 23, 2010, 1:54:27 PM (16 years ago)

Author:

Paul Price

Message:

Fixing compression, adding weighted exposure map.

File:

• branches/pap_stack/psModules/src/imcombine/pmStack.c (modified) (13 diffs)

branches/pap_stack/psModules/src/imcombine/pmStack.c

@@ -34 +34 @@
 
 
-//#define TESTING                         // Enable test output
-//#define TEST_X 843-1                     // x coordinate to examine
-//#define TEST_Y 813-1                     // y coordinate to examine
-//#define TEST_RADIUS 0                    // Radius to examine
+#define TESTING                         // Enable test output
+#define TEST_X 843-1                     // x coordinate to examine
+#define TEST_Y 813-1                     // y coordinate to examine
+#define TEST_RADIUS 0                    // Radius to examine
 
 
@@ -129 +129 @@
     float sumExp = 0.0;                 // Sum of the exposure time
     float sumExpWeight = 0.0;           // Sum of the exposure time multiplied by the global weights
+    int numGood = 0;                    // Number of good exposures
     for (int i = 0; i < values->n; i++) {
         sumValueWeight += values->data.F32[i] * weights->data.F32[i];
@@ -138 +139 @@
             sumExp += exps->data.F32[i];
             sumExpWeight += exps->data.F32[i] * weights->data.F32[i];
+            numGood++;
         }
     }
@@ -153 +155 @@
     }
     if (expWeight) {
-        *expWeight = sumExpWeight / sumWeight;
+        *expWeight = sumExpWeight;
     }
     return true;
@@ -391 +393 @@
                           int x, int y, // Coordinates of interest; frame of output image
                           psImageMaskType bad, // Value for bad pixels
-                          bool safe             // Safe combination?
+                          bool safe,           // Safe combination?
+                          float invTotalWeight    // Inverse of total weight for all inputs
                           )
 {
@@ -423 +426 @@
               if (exp) {
                   expValue = pixelExps->data.F32[0];
+                  expWeightValue = pixelExps->data.F32[0];
               }
               maskValue = 0;
@@ -490 +494 @@
     }
     if (expweight) {
-        expweight->data.F32[y][x] = expWeightValue;
+        expweight->data.F32[y][x] = expWeightValue * invTotalWeight;
     }
 
@@ -1024 +1028 @@
     psVector *exps = psVectorAlloc(num, PS_TYPE_F32);    // Exposure times for each image
     psArray *stack = psArrayAlloc(num); // Stack of readouts
+    float totalExpWeight = 0.0;           // Total value of all weighted exposure times
+    float totalExp = 0.0;                 // Total exposure time
     for (int i = 0; i < num; i++) {
         pmStackData *data = input->data[i]; // Stack data for this input
@@ -1033 +1039 @@
         weights->data.F32[i] = data->weight;
         exps->data.F32[i] = data->exp;
+        totalExp += exps->data.F32[i];
+        totalExpWeight += exps->data.F32[i] * weights->data.F32[i];
         pmReadout *ro = data->readout;  // Readout of interest
         stack->data[i] = psMemIncrRefCounter(ro);
@@ -1051 +1059 @@
         }
     }
+    totalExpWeight = totalExp / totalExpWeight;    // Convert to inverse
 
     int minInputCols, maxInputCols, minInputRows, maxInputRows; // Smallest and largest values to combine
@@ -1095 +1104 @@
     }
 
-    psImage *exp = NULL, *expnum = NULL; // Exposure map and exposure number
+    psImage *exp = NULL, *expnum = NULL, *expweight = NULL; // Exposure map and exposure number
     if (expmaps) {
         if (!expmaps->image) {
@@ -1106 +1115 @@
         }
         expnum = expmaps->mask;
+
+        if (!expmaps->variance) {
+            expmaps->variance = psImageAlloc(numCols, numRows, PS_TYPE_F32);
+        }
+        expweight = expmaps->variance;
     }
 
@@ -1145 +1159 @@
             combineExtract(&num, &suspect, buffer, combinedImage, combinedMask, combinedVariance,
                            input, weights, exps, addVariance, reject, x, y, maskVal, maskSuspect);
-            combinePixels(combinedImage, combinedMask, combinedVariance, exp, expnum, NULL,
-                          num, buffer, x, y, bad, safe);
+            combinePixels(combinedImage, combinedMask, combinedVariance, exp, expnum, expweight,
+                          num, buffer, x, y, bad, safe, totalExpWeight);
 
             if (iter > 0) {