Changeset 16412

Timestamp:

Feb 12, 2008, 2:06:11 PM (18 years ago)

Author:

Paul Price

Message:

Get data from the right place. Update type for the kernels.

File:

• branches/pap_branch_080207/ppStack/src/ppStackMatch.c (modified) (2 diffs)

branches/pap_branch_080207/ppStack/src/ppStackMatch.c

@@ -121 +121 @@
     *regions = psArrayAllocEmpty(ARRAY_BUFFER); // Array of regions
     {
-        psMetadataIterator *iter = psMetadataIteratorAlloc(readout->analysis, PS_LIST_HEAD,
+        psMetadataIterator *iter = psMetadataIteratorAlloc(output->analysis, PS_LIST_HEAD,
                                                            PM_SUBTRACTION_ANALYSIS_REGION); // Iterator
         psMetadataItem *item = NULL;// Item from iteration
@@ -132 +132 @@
     *kernels = psArrayAllocEmpty(ARRAY_BUFFER); // Array of kernels
     {
-        psMetadataIterator *iter = psMetadataIteratorAlloc(readout->analysis, PS_LIST_HEAD,
+        psMetadataIterator *iter = psMetadataIteratorAlloc(output->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);
+            assert(item->type == PS_DATA_UNKNOWN);
             *kernels = psArrayAdd(*kernels, ARRAY_BUFFER, item->data.V);
         }