Changeset 37807 for trunk/Ohana/src/opihi/dvo/mmatch.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/opihi/dvo/mmatch.c (modified) (3 diffs)

trunk/Ohana/src/opihi/dvo/mmatch.c

@@ -233 +233 @@
   ALLOCATE (index, off_t, Nelem);
 
+  // int needLensing = dbFieldNeedLensing (fields, Nfields);
+  int needStarpar = dbFieldNeedStarpar (fields, Nfields, FALSE);
+
   // grab data from all selected sky regions
   Signal = signal (SIGINT, handle_interrupt);
@@ -246 +249 @@
     catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
     catalog.catflags = LOAD_AVES | LOAD_SECF | LOAD_MEAS;
+    catalog.catflags |= needStarpar ? LOAD_STARPAR : SKIP_STARPAR;
     catalog.Nsecfilt = Nsecfilt;
 
@@ -282 +286 @@
         // extract the relevant values for this measurement
         dbExtractMeasuresInitMeas (); // reset counters for saved fields  (costs very little
+
+        Average *average = &catalog.average[Ncat];
+
+        int Nstarpar = average->starparOffset;
+        StarPar *starpar = needStarpar ? &catalog.starpar[Nstarpar] : NULL;
+
+        // int Nlensing = average->lensobjOffset;
+        // Lensobj *lensobj = needLensobj ? &catalog.lensobj[m] : NULL;
+
+        int Nsec = Ncat*Nsecfilt;
+        SecFilt *secfilt = &catalog.secfilt[Nsec];
+
         for (n = 0; n < Nfields; n++) {
-          values[n] = dbExtractMeasures (&catalog.average[Ncat], &catalog.secfilt[Ncat*Nsecfilt], &catalog.measure[m], &fields[n]);
+          values[n] = dbExtractMeasures (average, secfilt, &catalog.measure[m], NULL, starpar, &fields[n]);
         }