Changeset 31054 for trunk/ppStack

Timestamp:

Mar 25, 2011, 5:26:55 AM (15 years ago)

Author:

eugene

Message:

avoid errors from duplicate metadata entries; only supply TIME_FINAL for convolved stack

Location:

trunk/ppStack/src

Files:

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

trunk/ppStack/src/ppStackCombineFinal.c

@@ -114 +114 @@
 
     if (options->stats) {
-      psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_FINAL", 0,
-                       "Time to make final stack", psTimerMark("PPSTACK_FINAL"));
+        // 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"));
+        }
     }
     

trunk/ppStack/src/ppStackCombineInitial.c

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

trunk/ppStack/src/ppStackConvolve.c

@@ -368 +368 @@
 
     if (options->stats) {
-      psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_CONVOLVE", 0,
+      psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_CONVOLVE", PS_META_REPLACE,
                        "Time to convolve input images", psTimerMark("PPSTACK_CONVOLVE"));
     }

trunk/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"));
     }