Changeset 38629

Timestamp:

Jul 23, 2015, 8:48:12 AM (11 years ago)

Author:

eugene

Message:

dvomerge add a note and a warning for -replace

Location:

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src

Files:

• merge_catalogs_old.c (modified) (1 diff)
• replace_match.c (modified) (2 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -217 +217 @@
         // XXX this does not support lensing measurements
         int Mout = output[0].average[n].measureOffset;  
-        if (replace_match(&output[0].average[n], &output[0].measure[Mout], &input[0].average[N], &input[0].measure[offset])) {
+        if (replace_match (&output[0].average[n], &output[0].measure[Mout], &input[0].average[N], &input[0].measure[offset])) {
           input[0].found_t[N] = Mout;
           continue;

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/replace_match.c

@@ -1 +1 @@
 # include "dvomerge.h"
+
+// XXX this function does not work because it it loops over the average->Nmeasure entries
+// as if they were sorted, but objects which have had entries added to them have elements
+// out of sequence.  I probably need to step through next_meas to find the sequence.
 
 // average and measure pointers to the objects of interest and their first / current measurement
@@ -7 +11 @@
   unsigned int averef;
   unsigned int catID;
+
+  myAbort ("fix this function to use next_meas to loop over measurements for an object");
 
   // find the matching photcode in the object's list of measurements