Changeset 14311

Timestamp:

Jul 18, 2007, 4:03:42 PM (19 years ago)

Author:

Paul Price

Message:

Don't need to convolve if the pixel is masked.

File:

• trunk/psModules/src/imcombine/pmSubtraction.c (modified) (2 diffs)

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-07-19 01:39:28 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-07-19 02:03:42 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -1050 +1050 @@
                             convWeight->data.F32[y][x] = NAN;
                         }
-                    }
-
-                    // Convolve the image
-                    for (int v = -size; v <= size; v++) {
-                        for (int u = -size; u <= size; u++) {
-                            convImage->data.F32[y][x] += kernelImage->kernel[v][u] *
-                                inImage->data.F32[y + v][x + u];
-                        }
-                    }
-
-                    // Convolve the weight (variance) map
-                    if (inWeight) {
+                    } else {
+                        // Convolve the image
                         for (int v = -size; v <= size; v++) {
                             for (int u = -size; u <= size; u++) {
-                                convWeight->data.F32[y][x] += kernelWeight->kernel[v][u] *
-                                    inWeight->data.F32[y + v][x + u];
+                                convImage->data.F32[y][x] += kernelImage->kernel[v][u] *
+                                    inImage->data.F32[y + v][x + u];
+                            }
+                        }
+
+                        // Convolve the weight (variance) map
+                        if (inWeight) {
+                            for (int v = -size; v <= size; v++) {
+                                for (int u = -size; u <= size; u++) {
+                                    convWeight->data.F32[y][x] += kernelWeight->kernel[v][u] *
+                                        inWeight->data.F32[y + v][x + u];
+                                }
                             }
                         }