Changeset 37807 for trunk/Ohana/src/dvomerge/src/merge_catalogs_new.c

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/dvomerge/src/merge_catalogs_new.c (modified) (3 diffs)

trunk/Ohana/src/dvomerge/src/merge_catalogs_new.c

@@ -11 +11 @@
   
   off_t i, j, offset;
-  off_t NAVERAGE, NMEASURE, NLENSING, Naverage, Nmeasure, Nlensing, NsecfiltIn, NsecfiltOut, Nm;
+  off_t NAVERAGE, NMEASURE, NLENSING, NSTARPAR, Naverage, Nmeasure, Nlensing, Nstarpar, NsecfiltIn, NsecfiltOut, Nm;
 
   Naverage = output[0].Naverage;
@@ -81 +81 @@
       output[0].average[Naverage].Nlensing = Nm;
 
+      Nm = 0;
+      for (j = 0; j < input[0].average[i].Nstarpar; j++) {
+          offset = input[0].average[i].starparOffset + j;
+
+          output[0].starpar[Nstarpar] = input[0].starpar[offset];
+          output[0].starpar[Nstarpar].averef = Naverage;
+
+          Nstarpar ++;
+          Nm ++;
+          if (Nstarpar == NSTARPAR) {
+              NSTARPAR += 1000;
+              REALLOCATE (output[0].starpar, StarPar, NSTARPAR);
+          }
+      }
+      output[0].average[Naverage].Nstarpar = Nm;
+
       Naverage ++;
       if (Naverage == NAVERAGE) {
@@ -91 +107 @@
   REALLOCATE (output[0].measure, Measure, MAX (Nmeasure, 1));
   REALLOCATE (output[0].lensing, Lensing, MAX (Nlensing, 1));
+  REALLOCATE (output[0].starpar, StarPar, MAX (Nstarpar, 1));
   REALLOCATE (output[0].secfilt, SecFilt, NsecfiltOut*MAX (Naverage, 1));
   output[0].Naverage = Naverage;
   output[0].Nlensing = Nlensing;
+  output[0].Nstarpar = Nstarpar;
   output[0].Nsecf_mem = Naverage * NsecfiltOut;