Changeset 19213

Timestamp:

Aug 26, 2008, 10:40:58 AM (18 years ago)

Author:

Paul Price

Message:

The input sources and the final product sources were being confused
--- the final merged list of sources had the same pointer as the first
input source array (which multiplies the number of spurious sources
and hence makes it difficult to match PSFs). To get around this, use
a completely new array in the source list instead of borrowing the
input. This may generate a memory leak somewhere, but I'm not worried
about that yet. Also added a function to print the sources to a ds9
region file --- useful for debugging.

File:

• trunk/ppStack/src/ppStackSources.c (modified) (2 diffs)

trunk/ppStack/src/ppStackSources.c

@@ -117 +117 @@
     psMemSetDeallocator(list, (psFreeFunc)stackSourceListFree);
 
-    list->sources = psMemIncrRefCounter(sources);
+    // Copy the sources onto a new array, so there's no confusion between the inputs and outputs
+    long num = sources->n;              // Number of sources
+    list->sources = psArrayAlloc(num);
+    for (long i = 0; i < num; i++) {
+        list->sources->data[i] = psMemIncrRefCounter(sources->data[i]);
+    }
+
     list->bounds = NULL;
     list->indices = NULL;
@@ -447 +453 @@
     return psMemIncrRefCounter(firstList->sources);
 }
+
+
+
+void ppStackSourcesPrint(const psArray *sources)
+{
+    static int num = 0;                 // Number of source array
+    psString filename = NULL;           // Name of file
+    psStringAppend(&filename, "sources_%d.reg", num++);
+
+    const char *goodColour = "green";   // Colour for good sources
+    const char *badColour = "red";      // Colour for bad sources
+    float radius = 5;                   // Radius for circle
+
+    FILE *file = fopen(filename, "w");  // File to which to write
+    psFree(filename);
+    for (int i = 0; i < sources->n; i++) {
+        pmSource *source = sources->data[i]; // Source of interest
+        if (!source) {
+            continue;
+        }
+
+        float x, y;                     // Source coordinates
+        coordsFromSource(&x, &y, source);
+
+        bool bad = (source->mode & SOURCE_MASK) || !isfinite(source->psfMag) ||
+            source->psfMag > SOURCE_FAINTEST; // Is this a bad source?
+
+        fprintf(file, "image; circle(%f,%f,%f) # color = %s\n", x, y, radius, bad ? badColour : goodColour);
+    }
+    fclose(file);
+
+    return;
+}