Changeset 30874

Timestamp:

Mar 10, 2011, 6:03:50 PM (15 years ago)

Author:

watersc1

Message:

update to ppSub and ppStack to add timers to the stats output

Location:

trunk

Files:

• ppStack/src/ppStackCleanup.c (modified) (1 diff)
• ppStack/src/ppStackCombineFinal.c (modified) (2 diffs)
• ppStack/src/ppStackCombineInitial.c (modified) (1 diff)
• ppStack/src/ppStackConvolve.c (modified) (2 diffs)
• ppSub/src/ppSub.c (modified) (2 diffs)

trunk/ppStack/src/ppStackCleanup.c

@@ -116 +116 @@
 
     psTrace("ppStack", 1, "Finished at %f sec\n", psTimerMark("PPSTACK"));
+    psLogMsg("ppStack", PS_LOG_INFO, "Complete ppStack run: %f sec\n", psTimerMark("PPSTACK"));
     psTimerStop();
 

trunk/ppStack/src/ppStackCombineFinal.c

@@ -10 +10 @@
     psAssert(config, "Require configuration");
 
+    psTimerStart("PPSTACK_FINAL");
+    
     pmReadout *outRO = options->outRO;                                      // Output readout
     pmReadout *expRO = options->expRO;                                      // Exposure readout
@@ -111 +113 @@
 #endif
 
+    if (options->stats) {
+      psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_FINAL", 0,
+                       "Time to make final stack", psTimerMark("PPSTACK_FINAL"));
+    }
+    
     return true;
 }

trunk/ppStack/src/ppStackCombineInitial.c

@@ -90 +90 @@
     if (options->stats) {
         psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_INITIAL", 0,
-                         "Time to make final stack", psTimerMark("PPSTACK_INITIAL"));
+                         "Time to make initial stack", psTimerMark("PPSTACK_INITIAL"));
     }
 

trunk/ppStack/src/ppStackConvolve.c

@@ -16 +16 @@
     psAssert(config, "Require configuration");
 
+    psTimerStart("PPSTACK_CONVOLVE");
+    
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // ppStack recipe
     psAssert(recipe, "We've thrown an error on this before.");
@@ -365 +367 @@
     psFree(renorms);
 
+    if (options->stats) {
+      psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_CONVOLVE", 0,
+                       "Time to convolve input images", psTimerMark("PPSTACK_CONVOLVE"));
+    }
+    
     return true;
 }

trunk/ppSub/src/ppSub.c

@@ -71 +71 @@
 
         if (data && data->stats && data->statsFile) {
+            psMetadataAddF32(data->stats, PS_LIST_TAIL, "TIME_DIFF", 0, "Total time (sec)", psTimerMark("ppSub"));
             psString stats = psMetadataConfigFormat(data->stats); // Statistics to output
             if (!stats || strlen(stats) == 0) {
@@ -104 +105 @@
 
         psTrace("ppSub", 1, "Finished at %f sec\n", psTimerMark("ppSub"));
+        psLogMsg("ppSub", PS_LOG_INFO, "Complete ppSub run: %f sec\n", psTimerMark("ppSub"));
         psTimerStop();