Changeset 25120 for trunk/psModules/src/imcombine/pmSubtractionStamps.c

Timestamp:

Aug 18, 2009, 3:19:25 PM (17 years ago)

Author:

Paul Price

Message:

Better method for deciding which image to convolve: generate solutions both ways, and choose the one with the lower residuals. We save the convolutions and least-squares matrices we generate, so that they don't have to be regenerated for the winner. Looks like this works!

File:

• trunk/psModules/src/imcombine/pmSubtractionStamps.c (modified) (3 diffs)

trunk/psModules/src/imcombine/pmSubtractionStamps.c

@@ -254 +254 @@
         outStamp->status = inStamp->status;
 
-        outStamp->image1 = psKernelCopy(inStamp->image1);
-        outStamp->image2 = psKernelCopy(inStamp->image2);
-        outStamp->variance = psKernelCopy(inStamp->variance);
+        outStamp->image1 = inStamp->image1 ? psKernelCopy(inStamp->image1) : NULL;
+        outStamp->image2 = inStamp->image2 ? psKernelCopy(inStamp->image2) : NULL;
+        outStamp->variance = inStamp->variance ? psKernelCopy(inStamp->variance) : NULL;
 
         if (inStamp->convolutions1) {
@@ -262 +262 @@
             outStamp->convolutions1 = psArrayAlloc(size);
             for (int j = 0; j < size; j++) {
-                outStamp->convolutions1->data[j] = psKernelCopy(inStamp->convolutions1->data[j]);
+                psKernel *conv = inStamp->convolutions1->data[j]; // Convolution
+                outStamp->convolutions1->data[j] = conv ? psKernelCopy(conv) : NULL;
             }
+        } else {
+            outStamp->convolutions1 = NULL;
         }
         if (inStamp->convolutions2) {
@@ -269 +272 @@
             outStamp->convolutions2 = psArrayAlloc(size);
             for (int j = 0; j < size; j++) {
-                outStamp->convolutions2->data[j] = psKernelCopy(inStamp->convolutions2->data[j]);
+                psKernel *conv = inStamp->convolutions2->data[j]; // Convolution
+                outStamp->convolutions2->data[j] = conv ? psKernelCopy(conv) : NULL;
             }
+        } else {
+            outStamp->convolutions2 = NULL;
         }