Changeset 33638 for branches/eam_branches/ipp-20111122/psModules/src/imcombine/pmSubtraction.c

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/psModules/src/imcombine/pmSubtraction.c (modified) (5 diffs)

branches/eam_branches/ipp-20111122/psModules/src/imcombine/pmSubtraction.c

@@ -796 +796 @@
     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 - it is?
 
     return pmSubtractionConvolveStamp(stamp, kernels, footprint);
@@ -832 +832 @@
 
 #ifdef TESTING
+    //MEH - index conflict or changed in past?
     for (int j = 0; j < kernels->num; j++) {
         if (stamp->convolutions1) {
             psString convName = NULL;
-            psStringAppend(&convName, "conv1_%03d_%03d.fits", index, j);
-            psFits *fits = psFitsOpen(convName, "w");
+            //psStringAppend(&convName, "conv1_%03d_%03d.fits", index, j);
+            psStringAppend(&convName, "conv1_xxx_%03d.fits", j);
+            psFits *fits = psFitsOpen(convName, "w");
             psFree(convName);
             psKernel *conv = stamp->convolutions1->data[j];
@@ -845 +847 @@
         if (stamp->convolutions2) {
             psString convName = NULL;
-            psStringAppend(&convName, "conv2_%03d_%03d.fits", index, j);
-            psFits *fits = psFitsOpen(convName, "w");
+            //psStringAppend(&convName, "conv2_%03d_%03d.fits", index, j);
+            psStringAppend(&convName, "conv2_xxx_%03d.fits", j);
+            psFits *fits = psFitsOpen(convName, "w");
             psFree(convName);
             psKernel *conv = stamp->convolutions2->data[j];
@@ -905 +908 @@
         }
     }
-    if (!psThreadPoolWait(true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         return false;
@@ -1427 +1430 @@
     }
 
-    if (!psThreadPoolWait(false)) {
+    if (!psThreadPoolWait(false, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         return false;