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

Timestamp:

Feb 11, 2008, 6:12:19 PM (18 years ago)

Author:

Paul Price

Message:

Now reads temporary convolved images bit by bit. Updating the stacking process to use modern APIs (the kernel solution is now a part of the pmSubtractionKernels).

File:

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

branches/pap_branch_080207/ppStack/src/ppStackReadout.c

@@ -10 +10 @@
 #include "ppStack.h"
 
+
+#define ARRAY_BUFFER 16                 // Number to add to array at a time
 #define WCS_TOLERANCE 0.001             // Tolerance for WCS
 
@@ -26 +28 @@
     psMaskType maskBad = psMetadataLookupU8(NULL, config->arguments, "MASK.BAD"); // Value to mask
     psMaskType maskBlank = psMetadataLookupU8(NULL, config->arguments, "MASK.BLANK"); // Mask for blank reg.
-//    float threshold = psMetadataLookupF32(NULL, config->arguments, "THRESHOLD.MASK"); // Threshold for mask deconvolution
+    float threshold = psMetadataLookupF32(NULL, config->arguments, "THRESHOLD.MASK"); // Threshold for mask deconvolution
 
     int num = readouts->n;              // Number of inputs
@@ -49 +51 @@
             weighting = 1.0;
         }
-
-#if 0
-        // I don't think 'scale' is needed, since the convolution matches the scales
-        float scale = psMetadataLookupF32(&mdok, fpa->analysis, "PPSTACK.SCALE"); // Rel. scale
-        if (!mdok || !isfinite(scale)) {
-            psWarning("No SCALE supplied for image %d --- set to unity.", i);
-            scale = 1.0;
-        }
-#endif
 
         float exposure = psMetadataLookupF32(NULL, ro->parent->concepts, "CELL.EXPOSURE"); // Exposure time
@@ -135 +128 @@
 #endif
 
-
-
-    // XXX THIS NEEDS WORK
-#if 0
     for (int i = 0; i < num; i++) {
         pmStackData *data = stack->data[i]; // Data for this image
         pmReadout *readout = data->readout; // Readout for this image
-
-
-        // XXX Need some other mechanism to get the subtraction kernel
-
 
         // Extract the regions and solutions used in the image matching
@@ -151 +136 @@
         {
             psMetadataIterator *iter = psMetadataIteratorAlloc(readout->analysis, PS_LIST_HEAD,
-                                                               "^SUBTRACTION.REGION$"); // Iterator
+                                                               PM_SUBTRACTION_ANALYSIS_REGION); // Iterator
             psMetadataItem *item = NULL;// Item from iteration
             while ((item = psMetadataGetAndIncrement(iter))) {
@@ -159 +144 @@
             psFree(iter);
         }
-        psArray *solutions = psArrayAllocEmpty(ARRAY_BUFFER); // Array of solutions
+        psArray *kernels = psArrayAllocEmpty(ARRAY_BUFFER); // Array of kernels
         {
             psMetadataIterator *iter = psMetadataIteratorAlloc(readout->analysis, PS_LIST_HEAD,
-                                                               "^SUBTRACTION.SOLUTION$"); // Iterator
+                                                               PM_SUBTRACTION_ANALYSIS_KERNEL); // Iterator
             psMetadataItem *item = NULL;// Item from iteration
             while ((item = psMetadataGetAndIncrement(iter))) {
                 assert(item->type == PS_DATA_VECTOR);
-                solutions = psArrayAdd(solutions, ARRAY_BUFFER, item->data.V);
+                kernels = psArrayAdd(kernels, ARRAY_BUFFER, item->data.V);
             }
             psFree(iter);
         }
-        assert(regions->n == solutions->n);
-
-        pmSubtractionKernels *kernels = psMetadataLookupPtr(NULL, readout->analysis,
-                                                            "SUBTRACTION.KERNEL"); // Kernels
-
-        psPixels *reject = pmStackReject(data->pixels, threshold, regions,
-                                         solutions, kernels); // List of pixels to reject
+        assert(regions->n == kernels->n);
+
+        psPixels *reject = pmStackReject(data->pixels, threshold, regions, kernels); // Pixels to reject
         psFree(data->pixels);
         data->pixels = reject;
 
-        psFree(solutions);
+        psFree(kernels);
         psFree(regions);
     }
-#endif
-
 
 #ifdef REJECTION_FILES