Changeset 16854

Timestamp:

Mar 6, 2008, 1:04:22 PM (18 years ago)

Author:

Paul Price

Message:

Adding additional trace messages.

File:

• trunk/ppStack/src/ppStackLoop.c (modified) (8 diffs)

trunk/ppStack/src/ppStackLoop.c

@@ -227 +227 @@
 
     // Preparation iteration: Load the sources, and get a target PSF model
+    psTrace("ppStack", 1, "Determining target PSF....\n");
     pmReadout *sources = NULL;          // Readout with sources to use for PSF matching
     pmPSF *targetPSF = NULL;            // Target PSF
@@ -314 +315 @@
 
     // Generate convolutions and write them to disk
+    psTrace("ppStack", 1, "Convolving inputs to target PSF....\n");
     psArray *cells = psArrayAlloc(num); // Cells for convolved images --- a handle for reading again
     psArray *subKernels = psArrayAlloc(num); // Subtraction kernels --- required in the stacking
     psArray *subRegions = psArrayAlloc(num); // Subtraction regions --- required in the stacking
     for (int i = 0; i < num; i++) {
+        psTrace("ppStack", 2, "Convolving input %d of %d to target PSF....\n", i, num);
         pmFPAfileActivate(config->files, false, NULL);
         psArray *files = fileActivationSingle(config, convolveFiles, true, i);
@@ -362 +365 @@
 
     // Stack the convolved files
+    psTrace("ppStack", 1, "Initial stack of convolved images....\n", i, num);
     {
         pmFPAfileActivate(config->files, false, NULL);
@@ -412 +416 @@
         bool more = true;               // More to read?
         for (int numChunk = 0; more; numChunk++) {
+            psTrace("ppStack", 2, "Initial stack of chunk %d....\n", numChunk);
             for (int i = 0; i < num; i++) {
                 pmReadout *readout = readouts->data[i];
@@ -429 +434 @@
             }
 
-#ifdef TESTING
+#ifndef PS_NO_TRACE
             {
                 pmReadout *ro = readouts->data[0];
-                psTrace("ppStack", 1, "Stack: [%d:%d,%d:%d]\n", ro->col0, ro->col0 + ro->image->numCols,
+                psTrace("ppStack", 4, "Stack: [%d:%d,%d:%d]\n", ro->col0, ro->col0 + ro->image->numCols,
                         ro->row0, ro->row0 + ro->image->numRows);
             }
@@ -482 +487 @@
 
         // Read convolutions by chunks
+        psTrace("ppStack", 2, "Final stack of convolved images....\n");
         more = true;
         for (int numChunk = 0; more; numChunk++) {
+            psTrace("ppStack", 2, "Final stack of chunk %d....\n", numChunk);
             for (int i = 0; i < num; i++) {
                 pmReadout *readout = readouts->data[i];
@@ -500 +507 @@
             }
 
-#ifdef TESTING
+#ifndef PS_NO_TRACE
             {
                 pmReadout *ro = readouts->data[0];
-                psTrace("ppStack", 1, "Stack: [%d:%d,%d:%d]\n", ro->col0, ro->col0 + ro->image->numCols,
+                psTrace("ppStack", 4, "Stack: [%d:%d,%d:%d]\n", ro->col0, ro->col0 + ro->image->numCols,
                         ro->row0, ro->row0 + ro->image->numRows);
             }
@@ -549 +556 @@
         psFree(weightFits);
 
-        if (psMetadataLookupBool(&mdok, config->arguments, "PHOTOMETRY") &&
-            !ppStackPhotometry(config, outRO, view)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to perform photometry on output.");
-            psFree(outRO);
-            psFree(view);
-            return false;
+        if (psMetadataLookupBool(&mdok, config->arguments, "PHOTOMETRY")) {
+            psTrace("ppStack", 1, "Photometering stacked image....\n");
+            if (!ppStackPhotometry(config, outRO, view)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to perform photometry on output.");
+                psFree(outRO);
+                psFree(view);
+                return false;
+            }
         }
 
         // Statistics on output
         if (stats) {
+            psTrace("ppStack", 1, "Gathering statistics on stacked image....\n");
             ppStatsFPA(stats, outCell->parent->parent, view, maskBlank, config);
         }