Changeset 16686

Timestamp:

Feb 27, 2008, 11:17:39 AM (18 years ago)

Author:

Paul Price

Message:

Adding additional debugging output. Correcting combination areas for the overlap.

Location:

trunk/ppStack/src

Files:

• ppStack.c (modified) (1 diff)
• ppStackLoop.c (modified) (2 diffs)
• ppStackReadout.c (modified) (6 diffs)

trunk/ppStack/src/ppStack.c

@@ -23 +23 @@
         goto die;
     }
+
+    psTraceSetLevel("ppStack", 5);
 
     if (!ppStackArguments(argc, argv, config)) {

trunk/ppStack/src/ppStackLoop.c

@@ -10 +10 @@
 
 #include "ppStack.h"
+
+#define TESTING
 
 // Here follows lists of files for activation/deactivation at various stages.  Each must be NULL-terminated.
@@ -344 +346 @@
     psFree(targetPSF);
 
+
+#ifdef TESTING
+    psTraceSetLevel("psModules.imcombine", 7);
+#endif
+
+
     // Stack the convolved files
     {

trunk/ppStack/src/ppStackReadout.c

@@ -14 +14 @@
 #define REJECTION_FILES                 // Write rejection mask?
 #define INSPECTION_FILES                // Write inspection mask?
+#define COMBINED_FILES                  // Write combined images?
 
 static int sectionNum = 0;              // Section number; for debugging outputs
@@ -39 +40 @@
     bool useVariance = psMetadataLookupBool(&mdok, config->arguments, "VARIANCE"); // Use variance for rejection?
     bool safe = psMetadataLookupBool(&mdok, config->arguments, "SAFE"); // Play safe when combining small numbers of pixels?
+    psMetadata *ppsub = psMetadataLookupMetadata(NULL, config->recipes, "PPSUB"); // PPSUB recipe
+    int kernelSize = psMetadataLookupS32(NULL, ppsub, "KERNEL.SIZE"); // Kernel half-size
+
 
     int num = readouts->n;              // Number of inputs
@@ -109 +113 @@
     }
 
-    if (!pmStackCombine(outRO, stack, maskBad, maskBlank, iter, combineRej, useVariance, safe)) {
+    if (!pmStackCombine(outRO, stack, maskBad, maskBlank, kernelSize, iter, combineRej, useVariance, safe)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts with rejection.");
         psFree(fpaList);
@@ -117 +121 @@
     }
 
+#ifdef COMBINED_FILES
+    {
+        psString name = NULL;           // Name of image
+        psStringAppend(&name, "combined1_%03d.fits", sectionNum);
+        psFits *fits = psFitsOpen(name, "w");
+        psFree(name);
+        psFitsWriteImage(fits, NULL, outRO->image, 0, NULL);
+        psFitsClose(fits);
+    }
+#endif
 #ifdef INSPECTION_FILES
-    {
-        psString name = NULL;           // Name of image
-        psStringAppend(&name, "combined_%03d.fits", sectionNum);
-        psFits *fits = psFitsOpen(name, "w");
-        psFree(name);
-        psFitsWriteImage(fits, NULL, outRO->image, 0, NULL);
-        psFitsClose(fits);
-    }
-
     for (int i = 0; i < stack->n; i++) {
         pmStackData *data = stack->data[i]; // Data for this image
@@ -178 +183 @@
 #endif
 
-    if (!pmStackCombine(outRO, stack, maskBad, maskBlank, 0, combineRej, useVariance, false)) {
+    if (!pmStackCombine(outRO, stack, maskBad, maskBlank, kernelSize, 0, combineRej, useVariance, false)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts.");
         psFree(fpaList);
@@ -186 +191 @@
     }
 
+#ifdef COMBINED_FILES
+    {
+        psString name = NULL;           // Name of image
+        psStringAppend(&name, "combined2_%03d.fits", sectionNum);
+        psFits *fits = psFitsOpen(name, "w");
+        psFree(name);
+        psFitsWriteImage(fits, NULL, outRO->image, 0, NULL);
+        psFitsClose(fits);
+    }
+#endif
+
     psMetadataAddF32(outCell->concepts, PS_LIST_TAIL, "CELL.EXPOSURE", PS_META_REPLACE,
                      "Summed exposure time (sec)", totExposure);