Changeset 16407 for branches/pap_branch_080207/ppStack/src/ppStackReadout.c

Timestamp:

Feb 11, 2008, 6:47:44 PM (18 years ago)

Author:

Paul Price

Message:

Need to extract the subtraction kernels and regions before freeing.

File:

• branches/pap_branch_080207/ppStack/src/ppStackReadout.c (modified) (5 diffs)

branches/pap_branch_080207/ppStack/src/ppStackReadout.c

@@ -11 +11 @@
 
 
-#define ARRAY_BUFFER 16                 // Number to add to array at a time
 #define WCS_TOLERANCE 0.001             // Tolerance for WCS
 
@@ -17 +16 @@
 //#define INSPECTION_FILES                // Write inspection mask?
 
-bool ppStackReadout(const pmConfig *config, pmReadout *outRO, const psArray *readouts)
+bool ppStackReadout(const pmConfig *config, pmReadout *outRO, const psArray *readouts,
+                    const psArray *regions, const psArray *kernels)
 {
     assert(config);
     assert(outRO);
     assert(readouts);
+    assert(regions);
+    assert(kernels);
+    assert(readouts->n == regions->n);
+    assert(regions->n == kernels->n);
 
     // Get the recipe values
@@ -63 +67 @@
         totExposure += exposure;        // Total exposure time
 
+#if 0
         if (i == 0) {
             // Copy astrometry over
@@ -84 +89 @@
             }
         }
+#endif
 
         // Ensure there is a mask, or pmStackCombine will complain
@@ -128 +134 @@
 #endif
 
+    // Reject pixels
     for (int i = 0; i < num; i++) {
         pmStackData *data = stack->data[i]; // Data for this image
-        pmReadout *readout = data->readout; // Readout for this image
-
-        // Extract the regions and solutions used in the image matching
-        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);
-
-        psPixels *reject = pmStackReject(data->pixels, threshold, regions, kernels); // Pixels to reject
+        psPixels *reject = pmStackReject(data->pixels, threshold, regions->data[i],
+                                         kernels->data[i]); // Pixels to reject
         psFree(data->pixels);
         data->pixels = reject;
-
-        psFree(kernels);
-        psFree(regions);
     }