Changeset 37565

Timestamp:

Nov 6, 2014, 8:19:02 PM (12 years ago)

Author:

eugene

Message:

add starpar for mextract

Location:

branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo

Files:

• avextract.c (modified) (1 diff)
• mextract.c (modified) (3 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/avextract.c

@@ -166 +166 @@
   int needMeasure = dbFieldNeedMeasure (fields, Nfields);
   int needLensobj = dbFieldNeedLensobj (fields, Nfields);
-  int needStarpar = dbFieldNeedStarpar (fields, Nfields);
+  int needStarpar = dbFieldNeedStarpar (fields, Nfields, TRUE);
 
   // grab data from all selected sky regions

branches/eam_branches/ipp-20140904/Ohana/src/opihi/dvo/mextract.c

@@ -211 +211 @@
   }
 
+  // int needLensing = dbFieldNeedLensing (fields, Nfields);
+  int needStarpar = dbFieldNeedStarpar (fields, Nfields, FALSE);
+
   // grab data from all selected sky regions
   Signal = signal (SIGINT, handle_interrupt);
@@ -227 +230 @@
     catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
     catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    // catalog.catflags |= needLensing ? LOAD_LENSING : SKIP_LENSING;
+    catalog.catflags |= needStarpar ? LOAD_STARPAR : SKIP_STARPAR;
     catalog.Nsecfilt = Nsecfilt;
 
@@ -259 +264 @@
         // extract the relevant values for this measurement
         dbExtractMeasuresInitMeas (); // reset counters for saved fields  (costs very little
+
+        Average *average = &catalog.average[j];
+
+        int Nstarpar = average->starparOffset;
+        StarPar *starpar = needStarpar ? &catalog.starpar[Nstarpar] : NULL;
+
+        // int Nlensing = average->lensobjOffset;
+        // Lensobj *lensobj = needLensobj ? &catalog.lensobj[m] : NULL;
+
+        int Nsec = j*Nsecfilt;
+        SecFilt *secfilt = &catalog.secfilt[Nsec];
+
         for (n = 0; n < Nfields; n++) {
-          values[n] = dbExtractMeasures (&catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], &fields[n]);
+          values[n] = dbExtractMeasures (average, secfilt, &catalog.measure[m], NULL, starpar, &fields[n]);
         }
         // fprintf (stderr, "object: ave: %f, cat: %f, averef %d\n", fields[n].name, values[2], values[3], catalog.measure[m].averef);