Changeset 31090

Timestamp:

Mar 30, 2011, 9:41:12 AM (15 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20110213/ppStack/src

Files:

• ppStackCleanup.c (modified) (1 diff)
• ppStackCombineFinal.c (modified) (2 diffs)
• ppStackCombineInitial.c (modified) (1 diff)
• ppStackConvolve.c (modified) (2 diffs)
• ppStackPhotometry.c (modified) (1 diff)

branches/eam_branches/ipp-20110213/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();
 

branches/eam_branches/ipp-20110213/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) {
+        // only add the timer if it has not been set (convolved stack)
+        // XXX this is weak: we should be distinguishing explicitly between convolved and unconvolved stacks
+        psMetadataLookupF32 (&status, options->stats, "TIME_FINAL");
+        if (!status) {
+          psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_FINAL", PS_META_REPLACE, "Time to make final stack", psTimerMark("PPSTACK_FINAL"));
+        }
+    }
+    
     return true;
 }

branches/eam_branches/ipp-20110213/ppStack/src/ppStackCombineInitial.c

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

branches/eam_branches/ipp-20110213/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.");
@@ -424 +426 @@
     psFree(satValues);
 
+    if (options->stats) {
+      psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_CONVOLVE", PS_META_REPLACE,
+                       "Time to convolve input images", psTimerMark("PPSTACK_CONVOLVE"));
+    }
+    
     return true;
 }

branches/eam_branches/ipp-20110213/ppStack/src/ppStackPhotometry.c

@@ -84 +84 @@
             psMetadataAddS32(options->stats, PS_LIST_TAIL, "NUM_SOURCES", 0, "Number of sources detected", 0);
         }
-        psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_PHOT", 0, "Time to do photometry", psTimerMark("PPSTACK_PHOT"));
+        psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_PHOT", PS_META_REPLACE, "Time to do photometry", psTimerMark("PPSTACK_PHOT"));
     }