Changeset 14515

Timestamp:

Aug 15, 2007, 2:32:43 PM (19 years ago)

Author:

Paul Price

Message:

Making the input mask optional for pmSubtractionMask --- necessary if we're convolving to a desired PSF rather than to an image.

Location:

trunk/psModules/src/imcombine

Files:

• pmSubtraction.c (modified) (4 diffs)
• pmSubtraction.h (modified) (2 diffs)

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-08-15 23:17:56 $
+ *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-08-16 00:32:43 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -332 +332 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-psImage *pmSubtractionMask(const psImage *inMask, const psImage *refMask, psMaskType maskVal,
+psImage *pmSubtractionMask(const psImage *refMask, const psImage *inMask, psMaskType maskVal,
                            int size, int footprint)
 {
-    PS_ASSERT_IMAGE_NON_NULL(inMask, NULL);
-    PS_ASSERT_IMAGE_TYPE(inMask, PS_TYPE_MASK, NULL);
     PS_ASSERT_IMAGE_NON_NULL(refMask, NULL);
     PS_ASSERT_IMAGE_TYPE(refMask, PS_TYPE_MASK, NULL);
-    PS_ASSERT_IMAGES_SIZE_EQUAL(inMask, refMask, NULL);
+    if (inMask) {
+        PS_ASSERT_IMAGE_NON_NULL(inMask, NULL);
+        PS_ASSERT_IMAGE_TYPE(inMask, PS_TYPE_MASK, NULL);
+        PS_ASSERT_IMAGES_SIZE_EQUAL(inMask, refMask, NULL);
+    }
     PS_ASSERT_INT_NONNEGATIVE(size, NULL);
     PS_ASSERT_INT_NONNEGATIVE(footprint, NULL);
 
     // Size of the images
-    int numCols = inMask->numCols;
-    int numRows = inMask->numRows;
+    int numCols = refMask->numCols;
+    int numRows = refMask->numRows;
 
     // Worried about the masks for bad pixels and bad stamps colliding, so make our own mask
@@ -353 +355 @@
     // Dereference for convenience
     psMaskType **maskData = mask->data.PS_TYPE_MASK_DATA;
-    psMaskType **inData = inMask->data.PS_TYPE_MASK_DATA;
+    psMaskType **inData = NULL;
+    if (inMask) {
+        inData = inMask->data.PS_TYPE_MASK_DATA;
+    }
     psMaskType **refData = refMask->data.PS_TYPE_MASK_DATA;
 
@@ -383 +388 @@
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
-            if (inData[y][x] & maskVal) {
+            if (inData && inData[y][x] & maskVal) {
                 maskData[y][x] |= PM_SUBTRACTION_MASK_INPUT;
                 // Block out the entire stamp footprint around this pixel

trunk/psModules/src/imcombine/pmSubtraction.h

@@ -6 +6 @@
  * @author GLG, MHPCC
  *
- * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-08-14 02:14:30 $
+ * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-08-16 00:32:43 $
  * Copyright 2004-207 Institute for Astronomy, University of Hawaii
  */
@@ -31 +31 @@
 
 /// Generate a mask for use in the subtraction process
-psImage *pmSubtractionMask(const psImage *inMask, ///< Mask for the input image
-                           const psImage *refMask, ///< Mask for the reference image (will be convolved)
+psImage *pmSubtractionMask(const psImage *refMask, ///< Mask for the reference image (will be convolved)
+                           const psImage *inMask, ///< Mask for the input image, or NULL
                            psMaskType maskVal, ///< Value to mask out
                            int size, ///< Half-size of the kernel (pmSubtractionKernels.size)