Changeset 16408 for branches/pap_branch_080207/ppStack/src/ppStackMatch.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/ppStackMatch.c (modified) (2 diffs)

branches/pap_branch_080207/ppStack/src/ppStackMatch.c

@@ -9 +9 @@
 #include "ppStack.h"
 
+#define ARRAY_BUFFER 16                 // Number to add to array at a time
+
+
 //#define TESTING
 
-bool ppStackMatch(pmReadout *readout, const pmReadout *sourcesRO, const pmPSF *psf, const pmConfig *config)
+bool ppStackMatch(pmReadout *readout, psArray **regions, psArray **kernels,
+                  const pmReadout *sourcesRO, const pmPSF *psf, const pmConfig *config)
 {
+    assert(readout);
+    assert(regions && !*regions);
+    assert(kernels && !*kernels);
+    assert(sourcesRO);
+    assert(psf);
+    assert(config);
+
     // Look up appropriate values from the ppSub recipe
     bool mdok;                          // Status of MD lookup
@@ -105 +116 @@
     readout->mask   = psMemIncrRefCounter(output->mask);
     readout->weight = psMemIncrRefCounter(output->weight);
+
+    // Extract the regions and solutions used in the image matching
+    // This stops them from being freed when we iterate back up the FPA
+    *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);
+    }
+    *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);
+
+
     psFree(output);