Changeset 31053

Timestamp:

Mar 25, 2011, 5:05:43 AM (15 years ago)

Author:

eugene

Message:

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

Location:

tags/ipp-20110218/ppStack/src

Files:

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

tags/ipp-20110218/ppStack/src/ppStackCombineFinal.c

@@ -11 +11 @@
 
     psTimerStart("PPSTACK_FINAL");
-    
+
     pmReadout *outRO = options->outRO;                                      // Output readout
     pmReadout *expRO = options->expRO;                                      // Exposure readout
@@ -87 +87 @@
     bool haveCovariances = false;
     if (covariances) {
-        for (int i = 0; i < covariances->n; i++) {
-            haveCovariances |= (covariances->data[i] != NULL);
-        }
+        for (int i = 0; i < covariances->n; i++) {
+            haveCovariances |= (covariances->data[i] != NULL);
+        }
     }
 
@@ -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_DUPLICATE_OK, "Time to make final stack", psTimerMark("PPSTACK_FINAL"));
+        }
     }
-    
+
     return true;
 }

tags/ipp-20110218/ppStack/src/ppStackCombineInitial.c

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

tags/ipp-20110218/ppStack/src/ppStackConvolve.c

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

tags/ipp-20110218/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_DUPLICATE_OK, "Time to do photometry", psTimerMark("PPSTACK_PHOT"));
     }