Changeset 19643

Timestamp:

Sep 22, 2008, 12:31:54 PM (18 years ago)

Author:

Paul Price

Message:

Adding additional output statistics for QA

Location:

trunk/ppStack/src

Files:

• ppStackLoop.c (modified) (12 diffs)
• ppStackMatch.c (modified) (1 diff)

trunk/ppStack/src/ppStackLoop.c

@@ -179 +179 @@
 {
     assert(config);
+
+    psTimerStart("PPSTACK_TOTAL");
 
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // ppStack recipe
@@ -429 +431 @@
         psArray *regions = NULL, *kernels = NULL; // Regions and kernels used in subtraction
         psArray *sources = haveSources ? globalSources : indSources->data[i]; // Sources for matching
+        psTimerStart("PPSTACK_MATCH");
         if (!ppStackMatch(readout, &regions, &kernels, &matchChi2->data.F32[i],
                           sources, targetPSF, rng, config)) {
@@ -436 +439 @@
             continue;
         }
+
+        if (stats) {
+            float stampMean = psMetadataLookupF32(NULL, readout->analysis,
+                                                  PM_SUBTRACTION_ANALYSIS_STAMPS_MEAN); // Mean deviation
+            float stampRMS = psMetadataLookupF32(NULL, readout->analysis,
+                                                 PM_SUBTRACTION_ANALYSIS_STAMPS_RMS);  // RMS deviation
+            psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_MATCH", PS_META_DUPLICATE_OK,
+                             "Time to match PSF", psTimerMark("PPSTACK_MATCH"));
+            psMetadataAddF32(stats, PS_LIST_TAIL, "STAMP.MEAN", PS_META_DUPLICATE_OK,
+                             "Mean deviation for stamps", stampMean);
+            psMetadataAddF32(stats, PS_LIST_TAIL, "STAMP.RMS", PS_META_DUPLICATE_OK,
+                             "RMS deviation for stamps", stampRMS);
+
+        }
+        psLogMsg("ppStack", PS_LOG_INFO, "Time to match image %d: %f sec", i, psTimerClear("PPSTACK_MATCH"));
 
         subRegions->data[i] = regions;
@@ -477 +495 @@
     ppStackThreadInit();
     ppStackThreadData *stack = ppStackThreadDataSetup(cells, imageNames, maskNames, weightNames, config);
+
+    psTimerStart("PPSTACK_INITIAL");
 
     memDump("preinitial");
@@ -640 +660 @@
     }
 
+    if (stats) {
+        psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_INITIAL", 0,
+                         "Time to make initial stack", psTimerMark("PPSTACK_INITIAL"));
+    }
+    psLogMsg("ppStack", PS_LOG_INFO, "Time to make initial stack: %f sec", psTimerClear("PPSTACK_INITIAL"));
+
+    psTimerStart("PPSTACK_REJECT");
+
     // Pixel rejection
     psArray *rejected = psArrayAlloc(num);
@@ -696 +724 @@
         // Reject bad pixels
         for (int i = 0; i < num; i++) {
+            psTimerStart("PPSTACK_REJECT");
 
 #ifdef TESTING
@@ -751 +780 @@
             }
             rejected->data[i] = reject;
+
+            if (stats) {
+                psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_REJECT", PS_META_DUPLICATE_OK,
+                                 "Time to perform rejection", psTimerMark("PPSTACK_REJECT"));
+                psMetadataAddS32(stats, PS_LIST_TAIL, "REJECT_PIXELS", PS_META_DUPLICATE_OK,
+                                 "Number of pixels rejected", reject ? reject->n : 0);
+            }
+            psLogMsg("ppStack", PS_LOG_INFO, "Time to perform rejection on image %d: %f sec", i,
+                     psTimerClear("PPSTACK_REJECT"));
         }
 
@@ -767 +805 @@
             return false;
         }
-    }
+
+        if (stats) {
+            psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_REJECT", PS_META_DUPLICATE_OK,
+                             "Time to perform rejection", psTimerMark("PPSTACK_REJECT"));
+            psMetadataAddS32(stats, PS_LIST_TAIL, "REJECT_IMAGES", 0,
+                             "Number of images rejected completely", numRejected);
+        }
+   }
+
+    psTimerStart("PPSTACK_FINAL");
 
     memDump("reject");
@@ -828 +875 @@
 
     memDump("final");
+
+    if (stats) {
+        psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_FINAL", 0,
+                         "Time to make final stack", psTimerMark("PPSTACK_FINAL"));
+    }
+    psLogMsg("ppStack", PS_LOG_INFO, "Time to make final stack: %f sec", psTimerClear("PPSTACK_FINAL"));
 
     psTrace("ppStack", 2, "Cleaning up after combination....\n");
@@ -904 +957 @@
         psTrace("ppStack", 1, "Photometering stacked image....\n");
 
+        psTimerStart("PPSTACK_PHOT");
+
         fileActivation(config, combineFiles, false);
         fileActivation(config, photFiles, true);
@@ -916 +971 @@
 
         fileActivation(config, combineFiles, true);
+
+        if (stats) {
+            pmFPAfile *photFile = psMetadataLookupPtr(NULL, config->files, "PSPHOT.INPUT"); // File
+            pmReadout *photRO = pmFPAviewThisReadout(view, photFile->fpa); // Readout with the sources
+            psArray *sources = psMetadataLookupPtr(NULL, photRO->analysis, "PSPHOT.SOURCES"); // Sources
+            psMetadataAddS32(stats, PS_LIST_TAIL, "NUM_SOURCES", 0, "Number of sources detected", sources->n);
+            psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_PHOT", 0,
+                             "Time to do photometry", psTimerMark("PPSTACK_PHOT"));
+        }
+        psLogMsg("ppStack", PS_LOG_INFO, "Time to do photometry: %f sec", psTimerClear("PPSTACK_PHOT"));
     }
 
@@ -952 +1017 @@
     // Write out summary statistics
     if (stats) {
+        psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_STACK", 0,
+                         "Time to do photometry", psTimerClear("PPSTACK_TOTAL"));
+
         const char *statsMDC = psMetadataConfigFormat(stats);
         if (!statsMDC || strlen(statsMDC) == 0) {

trunk/ppStack/src/ppStackMatch.c

@@ -266 +266 @@
             readout->mask   = psMemIncrRefCounter(output->mask);
             readout->weight = psMemIncrRefCounter(output->weight);
+
+            psMetadataCopy(readout->analysis, output->analysis);
         } else {
             // Fake the convolution