Changeset 24272

Timestamp:

May 28, 2009, 12:05:39 PM (17 years ago)

Author:

Paul Price

Message:

Copy covariance matrix when copying readout.

Location:

trunk

Files:

• psLib/src/imageops/psImageConvolve.c (modified) (1 diff)
• psLib/src/imageops/psImageConvolve.h (modified) (1 diff)
• psModules/src/camera/pmFPACopy.c (modified) (1 diff)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -122 +122 @@
 
     return kernel;
+}
+
+psKernel *psKernelCopy(const psKernel *in)
+{
+    PS_ASSERT_KERNEL_NON_NULL(in, NULL);
+
+    psKernel *out = psAlloc(sizeof(psKernel)); // The copied kernel, to be returned
+    psMemSetDeallocator(out,(psFreeFunc)kernelFree);
+
+    out->image = psImageCopy(NULL, in->image, PS_TYPE_KERNEL);
+    out->xMin = in->xMin;
+    out->xMax = in->xMax;
+    out->yMin = in->yMin;
+    out->yMax = in->yMax;
+
+    kernelRedirects(out, out->image->numRows);
+
+    return out;
 }
 

trunk/psLib/src/imageops/psImageConvolve.h

@@ -96 +96 @@
     );
 
+/// Copy a kernel
+///
+/// Performs a deep copy of the input kernel
+psKernel *psKernelCopy(
+    const psKernel *in                  ///< Kernel to be copied
+    );
+
 /// Checks the type of a particular pointer.
 ///

trunk/psModules/src/camera/pmFPACopy.c

@@ -242 +242 @@
         readoutCopyComponent(&targetReadout->variance, sourceReadout->variance, binning, xFlip, yFlip,
                              pixels);
+        // Copy covariance matrix: doesn't care about flips, etc.
+        if (sourceReadout->covariance) {
+            if (targetReadout->covariance) {
+                psFree(targetReadout->covariance);
+            }
+            targetReadout->covariance = psKernelCopy(sourceReadout->covariance);
+#if 0
+            if (binning) {
+                // XXX This isn't strictly correct, but we don't have a function that bins covariance matrices
+                // with unequal binning factors.
+                psKernel *covar = psImageCovarianceBin(PS_MAX(binning->nXbin, binning->nYbin),
+                                                       targetReadout->covariance);
+                psFree(targetReadout->covariance);
+                targetReadout->covariance = covar;
+            }
+#endif
+        }
 
         // Copy bias