Changeset 16408 for branches/pap_branch_080207/ppStack/src/ppStackLoop.c

Timestamp:

Feb 11, 2008, 7:09:46 PM (18 years ago)

Author:

Paul Price

Message:

Since I'm throwing away the convolved image in ppStackMatch(), I need to extract the regions and kernels there.

File:

• branches/pap_branch_080207/ppStack/src/ppStackLoop.c (modified) (4 diffs)

branches/pap_branch_080207/ppStack/src/ppStackLoop.c

@@ -10 +10 @@
 
 #include "ppStack.h"
-
-#define ARRAY_BUFFER 16                 // Number to add to array at a time
 
 // Here follows lists of files for activation/deactivation at various stages.  Each must be NULL-terminated.
@@ -327 +325 @@
 #ifndef CONVOLVED_ALREADY
         // Background subtraction, scaling and normalisation is performed automatically by the image matching
-        if (!ppStackMatch(readout, sources, targetPSF, config)) {
+        psArray *regions = NULL, *kernels = NULL; // Regions and kernels used in subtraction
+        if (!ppStackMatch(readout, &regions, &kernels, sources, targetPSF, config)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to match image %d --- ignoring.", i);
             psFree(sources);
@@ -333 +332 @@
             return false;
         }
+
+        subRegions->data[i] = regions;
+        subKernels->data[i] = kernels;
 
         // Write the temporary convolved files
@@ -342 +344 @@
 #endif
 
-        // Extract the regions and solutions used in the image matching
-        // This stops them from being freed when we iterate back up the FPA
-        psArray *regions = psArrayAllocEmpty(ARRAY_BUFFER); // Array of regions
-        {
-            psMetadataIterator *iter = psMetadataIteratorAlloc(readout->analysis, PS_LIST_HEAD,
-                                                               PM_SUBTRACTION_ANALYSIS_REGION); // Iterator
-            psMetadataItem *item = NULL;// Item from iteration
-            while ((item = psMetadataGetAndIncrement(iter))) {
-                assert(item->type == PS_DATA_REGION);
-                regions = psArrayAdd(regions, ARRAY_BUFFER, item->data.V);
-            }
-            psFree(iter);
-        }
-        psArray *kernels = psArrayAllocEmpty(ARRAY_BUFFER); // Array of kernels
-        {
-            psMetadataIterator *iter = psMetadataIteratorAlloc(readout->analysis, PS_LIST_HEAD,
-                                                               PM_SUBTRACTION_ANALYSIS_KERNEL); // Iterator
-            psMetadataItem *item = NULL;// Item from iteration
-            while ((item = psMetadataGetAndIncrement(iter))) {
-                assert(item->type == PS_DATA_VECTOR);
-                kernels = psArrayAdd(kernels, ARRAY_BUFFER, item->data.V);
-            }
-            psFree(iter);
-        }
-        assert(regions->n == kernels->n);
-
-        subRegions->data[i] = regions;
-        subKernels->data[i] = kernels;
         cells->data[i] = psMemIncrRefCounter(readout->parent);
-
         filesIterateUp(config);
     }