Changeset 14362

Timestamp:

Jul 20, 2007, 6:50:05 PM (19 years ago)

Author:

Paul Price

Message:

Adding support for RINGS kernel

Location:

trunk/ppSub/src

Files:

• ppSubArguments.c (modified) (2 diffs)
• ppSubReadout.c (modified) (13 diffs)

trunk/ppSub/src/ppSubArguments.c

@@ -185 +185 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-isis-widths", 0, "ISIS Gaussian widths (comma-separated)", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-isis-orders", 0, "ISIS polynomial orders (comma-separated)", NULL);
+    psMetadataAddS32(arguments, PS_LIST_TAIL, "-rings-order", 0, "RINGS polynomial order", -1);
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-inner", 0, "SPAM and FRIES inner radius", -1);
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-spam-binning", 0, "SPAM kernel binning", 2);
@@ -234 +235 @@
     VALUE_ARG_RECIPE_INT("-order",        "SPATIAL.ORDER",   S32, -1);
     VALUE_ARG_RECIPE_FLOAT("-spacing",    "STAMP.SPACING",   F32);
+    VALUE_ARG_RECIPE_INT("-rings-order",  "RINGS.ORDER",     S32, -1);
     VALUE_ARG_RECIPE_INT("-inner",        "INNER",           S32, -1);
     VALUE_ARG_RECIPE_INT("-spam-binning", "SPAM.BINNING",    S32, 0);

trunk/ppSub/src/ppSubReadout.c

@@ -12 +12 @@
 #define TESTING
 #define WCS_TOLERANCE 0.001             // Tolerance for WCS
+
+#include <unistd.h>
+static void memCheck(const char *where)
+{
+    return;
+    psMemBlock **leaks = NULL;
+    int numLeaks = psMemCheckLeaks(0, &leaks, NULL, true);
+    size_t largestSize = 0;
+    psMemId largest = 0;
+    size_t totalSize = 0;
+    for (int i = 0; i < numLeaks; i++) {
+        psMemBlock *mb = leaks[i];
+        totalSize += mb->userMemorySize;
+        if (mb->userMemorySize > largestSize) {
+            largestSize = mb->userMemorySize;
+            largest = mb->id;
+        }
+    }
+    psFree(leaks);
+    fprintf(stderr, "%s:\n", where);
+    fprintf(stderr, "    Memory in use: %zd\n", totalSize);
+    fprintf(stderr, "    Largest block: %ld\n", largest);
+    fprintf(stderr, "    sbrk(): %zd\n", (unsigned long)sbrk(0));
+    return;
+}
 
 bool ppSubReadout(pmConfig *config, const pmFPAview *view)
@@ -38 +63 @@
     psVector *orders = psMetadataLookupPtr(NULL, config->arguments, "ISIS.ORDERS"); // ISIS Polynomial orders
     int inner = psMetadataLookupS32(NULL, config->arguments, "INNER"); // Inner radius
+    int ringsOrder = psMetadataLookupS32(NULL, config->arguments, "RINGS.ORDER"); // RINGS polynomial order
     int binning = psMetadataLookupS32(NULL, config->arguments, "SPAM.BINNING"); // Binning for SPAM kernel
     psMaskType maskBad = pmConfigMask(psMetadataLookupStr(NULL, config->arguments, "MASK.BAD"),
@@ -62 +88 @@
     }
 
+    memCheck("start");
+
     // Mask for subtraction
     psImage *subMask = pmSubtractionMask(inRO->mask, refRO->mask, maskBad, size, footprint);
+
+    memCheck("mask");
 
 #if 0
@@ -81 +111 @@
 #endif
 
+    // Kernel basis functions
     pmSubtractionKernels *kernels = pmSubtractionKernelsGenerate(type, size, order, widths, orders,
-                                                                 inner, binning); // Kernel basis functions
+                                                                 inner, binning, ringsOrder);
     psArray *stamps = NULL;             // Stamps for matching PSF
     psVector *solution = NULL;          // Solution to match PSF
+
+    memCheck("kernels");
 
     int numRejected = -1;               // Number of rejected stamps in each iteration
@@ -94 +127 @@
         }
 
+        memCheck("  find stamps");
+
         if (!pmSubtractionCalculateEquation(stamps, refRO->image, inRO->image, inRO->weight,
                                             kernels, footprint)) {
@@ -100 +135 @@
          }
 
+        memCheck("  calculate equation");
+
         solution = pmSubtractionSolveEquation(solution, stamps);
         if (!solution) {
@@ -105 +142 @@
             goto ERROR;
         }
+
+        memCheck("  solve equation");
 
         numRejected = pmSubtractionRejectStamps(stamps, refRO->image, inRO->image, subMask,
@@ -113 +152 @@
         }
         psLogMsg("ppSub", PS_LOG_INFO, "%d stamps rejected on iteration %d.", numRejected, i);
+
+        memCheck("  reject stamps");
     }
 
@@ -124 +165 @@
     psFree(stamps);
     stamps = NULL;
+
+    memCheck("solution");
 
 #ifdef TESTING
@@ -179 +222 @@
 #endif
 
+    memCheck("diag outputs");
+
     psImage *convImage = NULL, *convWeight = NULL, *convMask = NULL; // Convolved images
     if (!pmSubtractionConvolve(&convImage, &convWeight, &convMask, refRO->image, refRO->weight, subMask,
@@ -191 +236 @@
     psFree(solution);
 
+    memCheck("convolution");
+
     // Do the subtraction
     if (reverse) {
@@ -202 +249 @@
     }
 
+    memCheck("subtraction");
+
     psFree(convImage);
     psFree(convMask);
     psFree(convWeight);
+
+    memCheck("subtraction freed");
 
     outRO->data_exists = true;
@@ -257 +308 @@
     }
 
+    memCheck("header");
+
     psFree(outRO);