Changeset 28250

Timestamp:

Jun 7, 2010, 3:33:39 PM (16 years ago)

Author:

eugene

Message:

need to allow for the catalog to have grown when choosing how to build links

File:

• trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c (modified) (2 diffs)

trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -96 +96 @@
 
   /* set up pointers for linked list of measure */
-  if (output[0].sorted && (output[0].Nmeasure == output[0].Nmeas_disk)) {
+  if (output[0].sorted && (output[0].Nmeasure >= output[0].Nmeas_disk)) {
     // this version is only valid if we have done a full catalog load, and if the catalog
     // is sorted while processed
@@ -182 +182 @@
       output[0].measure[Nmeas].objID    = output[0].average[n].objID;
       output[0].measure[Nmeas].catID    = output[0].catID;
+
+      assert (output[0].measure[Nmeas].averef < Nave);
 
       // fprintf (stderr, "Nave : "OFF_T_FMT", Nmeas : "OFF_T_FMT", dR: %f, dD: %f, catID: %d\n",  n,  Nmeas, output[0].measure[Nmeas].dR, output[0].measure[Nmeas].dD, output[0].measure[i].catID);