Changeset 38441 for trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/dvomerge/src/merge_catalogs_old.c (modified) (2 diffs)

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

@@ -112 +112 @@
 
   /* 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].Nmeasure_disk)) {
     // this version is only valid if we have done a full catalog load, and if the catalog
     // is sorted while processed
@@ -504 +504 @@
   output[0].Nlensing = Nlens;
   output[0].Nstarpar = Nstar;
-  output[0].Nsecf_mem = Nave*NsecfiltOut;
+  output[0].Nsecfilt_mem = Nave*NsecfiltOut;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas, Nlens: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nlens, Nmatch);