Changeset 31062

Timestamp:

Mar 27, 2011, 10:25:11 AM (15 years ago)

Author:

eugene

Message:

older formats did not carry objID and catID; we cannot validate those fields

File:

• branches/eam_branches/ipp-20110213/Ohana/src/addstar/src/resort_catalog.c (modified) (1 diff)

branches/eam_branches/ipp-20110213/Ohana/src/addstar/src/resort_catalog.c

@@ -92 +92 @@
     averageSeq[i] = measure[i].averef;
     
-    myAssert(average[averageSeq[i]].objID == measure[measureSeq[i]].objID, "object / detection mismatch");
-    myAssert(average[averageSeq[i]].catID == measure[measureSeq[i]].catID, "object / detection mismatch");
+    if (catalog[0].catformat >= DVO_FORMAT_PS1_V1) {
+      // earlier formats did not carry the objID or catID, so they are not available (we could assign on load, but we don't)
+      myAssert(average[averageSeq[i]].objID == measure[measureSeq[i]].objID, "object / detection mismatch");
+      myAssert(average[averageSeq[i]].catID == measure[measureSeq[i]].catID, "object / detection mismatch");
+    }
   }