Changeset 33431

Timestamp:

Mar 6, 2012, 1:54:09 PM (14 years ago)

Author:

mhuber

Message:

 

File:

• branches/meh_branches/ppstack_test/psModules/src/imcombine/pmSubtraction.c (modified) (5 diffs)

branches/meh_branches/ppstack_test/psModules/src/imcombine/pmSubtraction.c

@@ -30 +30 @@
 #include "pmSubtraction.h"
 
-# define FFT_WINDOW 0
-//#define TESTING
+#define FFT_WINDOW 0
+#define TESTING
 
 #define PIXEL_LIST_BUFFER 100           // Number of entries to add to pixel list at a time
@@ -262 +262 @@
 # if (FFT_WINDOW)
     psImage *convolved = psImageConvolveFFTwithWindow(NULL, subImage, subMask, maskVal, kernel); // Convolution
+    psLogMsg("psModules.imcombine", PS_LOG_DETAIL, "TESTING:: uses FFT_WINDOW");
 # else
     psImage *convolved = psImageConvolveFFT(NULL, subImage, subMask, maskVal, kernel); // Convolution
@@ -796 +797 @@
     pmSubtractionStamp *stamp = job->args->data[0]; // List of stamps
     pmSubtractionKernels *kernels = job->args->data[1]; // Kernels
-    int footprint = PS_SCALAR_VALUE(job->args->data[2], S32); // Stamp index
+    int footprint = PS_SCALAR_VALUE(job->args->data[2], S32); // Stamp index -- MEH no it isnt..
 
     return pmSubtractionConvolveStamp(stamp, kernels, footprint);
@@ -831 +832 @@
     }
 
+
 #ifdef TESTING
+    //MEH fix index issue - index is supposed to be an image index but from where?
     for (int j = 0; j < kernels->num; j++) {
         if (stamp->convolutions1) {
             psString convName = NULL;
-            psStringAppend(&convName, "conv1_%03d_%03d.fits", index, j);
+            //psStringAppend(&convName, "conv1_%03d_%03d.fits", index, j);
+            psStringAppend(&convName, "conv1_xxx_%03d.fits", j);
             psFits *fits = psFitsOpen(convName, "w");
             psFree(convName);
@@ -845 +849 @@
         if (stamp->convolutions2) {
             psString convName = NULL;
-            psStringAppend(&convName, "conv2_%03d_%03d.fits", index, j);
+            //psStringAppend(&convName, "conv2_%03d_%03d.fits", index, j);
+            psStringAppend(&convName, "conv2_xxx_%03d.fits", j);
             psFits *fits = psFitsOpen(convName, "w");
             psFree(convName);