Changeset 16408

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.

Location:

branches/pap_branch_080207/ppStack/src

Files:

• ppStack.h (modified) (1 diff)
• ppStackLoop.c (modified) (4 diffs)
• ppStackMatch.c (modified) (2 diffs)

branches/pap_branch_080207/ppStack/src/ppStack.h

@@ -51 +51 @@
 /// Convolve image to match specified seeing
 bool ppStackMatch(pmReadout *readout, ///< Readout to be convolved; replaced with output
+                  psArray **regions, // Array of regions used in each PSF matching, returned
+                  psArray **kernels, // Array of kernels used in each PSF matching, returned
                   const pmReadout *sourcesRO, ///< Readout with sources
                   const pmPSF *psf,     ///< Target PSF

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);
     }

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);