Changeset 2829 for trunk/psModules/src/pmReadoutCombine.c

Timestamp:

Dec 27, 2004, 10:14:29 AM (22 years ago)

Author:

gusciora

Message:

Added new specifications on readout combine operations. Still waiting on
the further clarifications for the pixel combine algorithm (Bug 227).

File:

• trunk/psModules/src/pmReadoutCombine.c (modified) (12 diffs)

trunk/psModules/src/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-24 02:39:17 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-27 20:14:29 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 p_psDetermineNumBits(data): This routine takes an enum psStatsOptions as an
 argument and returns the number of non-zero bits.
+ 
+XXX: Use static vectors.
  *****************************************************************************/
 psStatsOptions p_psDetermineNumBits(psStatsOptions data)
@@ -36 +38 @@
 }
 
-// XXX: Whats this?
-#define MAX_INT 10000
 psImage *pmReadoutCombine(psImage *output,
                           const psList *inputs,
@@ -44 +44 @@
                           const psVector *scale,
                           bool applyZeroScale,
-                          float gain,
-                          float readnoise)
+                          psF32 gain,
+                          psF32 readnoise)
 {
     PS_PTR_CHECK_NULL(inputs, NULL);
@@ -63 +63 @@
 
     psStats *stats = params->stats;
-    int i;
-    int j;
-    int maxInputCols = 0;
-    int maxInputRows = 0;
-    int minInputCols = MAX_INT;
-    int minInputRows = MAX_INT;
+    psS32 i;
+    psS32 j;
+    psS32 maxInputCols = 0;
+    psS32 maxInputRows = 0;
+    psS32 minInputCols = PS_MAX_S32;
+    psS32 minInputRows = PS_MAX_S32;
     psListElem *tmpInput = NULL;
     psReadout *tmpReadout = NULL;
-    int numInputs = 0;
-    int tmpI;
+    psS32 numInputs = 0;
+    psS32 tmpI;
     psElemType outputType = PS_TYPE_F32;
 
@@ -153 +153 @@
         output = psImageAlloc(maxInputCols-minInputCols,
                               maxInputRows-minInputRows, outputType);
-        *(int *) &(output->col0) = minInputCols;
-        *(int *) &(output->row0) = minInputRows;
+        *(psS32 *) &(output->col0) = minInputCols;
+        *(psS32 *) &(output->row0) = minInputRows;
     } else {
         if (((output->col0 + output->numCols) < maxInputCols) ||
@@ -210 +210 @@
     for (i = output->row0; i < (output->row0 + output->numRows) ; i++) {
         for (j = output->col0; j < (output->col0 + output->numCols) ; j++) {
-            for (int r = 0; r < numInputs ; r++) {
+            for (psS32 r = 0; r < numInputs ; r++) {
                 //  printf("[%d][%d]: [%d][%d] to [%d][%d]\n", i, j, outRowLower->data.U32[r], outColLower->data.U32[r], outRowUpper->data.U32[r], outColUpper->data.U32[r]);
                 if ((outRowLower->data.U32[r] <= i) &&
@@ -217 +217 @@
                         (outColUpper->data.U32[r] > j)) {
 
-                    int imageRow = i - (tmpReadouts[r]->row0 +
-                                        tmpReadouts[r]->image->row0);
-                    int imageCol = j - (tmpReadouts[r]->col0 +
-                                        tmpReadouts[r]->image->col0);
+                    psS32 imageRow = i - (tmpReadouts[r]->row0 +
+                                          tmpReadouts[r]->image->row0);
+                    psS32 imageCol = j - (tmpReadouts[r]->col0 +
+                                          tmpReadouts[r]->image->col0);
 
                     if ((NULL == tmpReadouts[r]->mask) ||
@@ -240 +240 @@
 
             // Determine how many pixels lie between fracLow and fracHigh.
-            int pixelCount = 0;
-            for (int r = 0; r < numInputs ; r++) {
+            psS32 pixelCount = 0;
+            for (psS32 r = 0; r < numInputs ; r++) {
                 if (tmpPixelMask->data.U8[r] == 0) {
                     if ((params->fracLow <= tmpPixels->data.F32[r]) &&
@@ -254 +254 @@
             // that range.
             if (pixelCount >= params->nKeep) {
-                for (int r = 0; r < numInputs ; r++) {
+                for (psS32 r = 0; r < numInputs ; r++) {
                     if (tmpPixelMask->data.U8[r] == 0) {
                         if ((params->fracLow <= tmpPixels->data.F32[r]) &&
@@ -266 +266 @@
             }
 
-            // XXX: Is this correct?
-            // We scale the pixels by the scale vector, if not-NULL.
-            if (scale != NULL) {
-                for (int r = 0; r < numInputs ; r++) {
-                    tmpPixels->data.F32[r]*= scale->data.F32[r];
-                }
-            }
-
-            // XXX: Is this correct?
-            // We add the zero vector, if non-NULL.
-            if (zero != NULL) {
-                for (int r = 0; r < numInputs ; r++) {
-                    tmpPixels->data.F32[r]+= zero->data.F32[r];
-                }
-            }
-
-            // XXX: Is this correct?
-            if (gain > 0.0) {
-                for (int r = 0; r < numInputs ; r++) {
-                    tmpPixels->data.F32[r]*= gain;
-                }
-            }
-
-            // XXX: Is this correct?
-            if (!(readnoise < 0.0)) {
-                for (int r = 0; r < numInputs ; r++) {
-                    tmpPixels->data.F32[r]+= readnoise;
+            // XXX: Still waiting on clarification of the algorithm.
+            #define SOME_FUNC(X, SIGMA) ((X))
+            if ((gain > 0.0) && (readnoise >= 0.0))
+            {
+                psF32 x;
+                psF32 sigma;
+                if (applyZeroScale == true) {
+                    for (psS32 r = 0; r < numInputs ; r++) {
+                        if (zero != NULL) {
+                            x = zero->data.F32[r];
+                        } else {
+                            x = 0.0;
+                        }
+                        if (scale != NULL) {
+                            x+= tmpPixels->data.F32[r] * scale->data.F32[r];
+                        } else {
+                            x+= tmpPixels->data.F32[r];
+                        }
+                        sigma = PS_SQRT_F32((readnoise*readnoise) + gain * x) / gain;
+
+                        tmpPixels->data.F32[r]= SOME_FUNC(x, sigma);
+                    }
+                } else {
+                    for (psS32 r = 0; r < numInputs ; r++) {
+                        x= tmpPixels->data.F32[r];
+
+                        if (zero != NULL) {
+                            sigma = zero->data.F32[r];
+                        } else {
+                            sigma = 0.0;
+                        }
+                        if (scale != NULL) {
+                            sigma+= tmpPixels->data.F32[r] * scale->data.F32[r];
+                        } else {
+                            sigma+= tmpPixels->data.F32[r];
+                        }
+                        sigma = PS_SQRT_F32((readnoise*readnoise) + (gain * sigma)) / gain;
+
+                        tmpPixels->data.F32[r]= SOME_FUNC(x, sigma);
+                    }
+                }
+            } else {
+                if (scale != NULL) {
+                    for (psS32 r = 0; r < numInputs ; r++) {
+                        tmpPixels->data.F32[r]*= scale->data.F32[r];
+                    }
+                }
+
+                // We add the zero vector, if non-NULL.
+                if (zero != NULL) {
+                    for (psS32 r = 0; r < numInputs ; r++) {
+                        tmpPixels->data.F32[r]+= zero->data.F32[r];
+                    }
                 }
             }
@@ -309 +335 @@
                 return(NULL);
             } else {
-                output->data.F32[i-output->row0][j-output->col0] = (float) statValue;
+                output->data.F32[i-output->row0][j-output->col0] = (psF32) statValue;
             }
         }