Changeset 42693 for branches/eam_branches/ipp-20230313/Ohana/src/opihi/dvo/mextract.c

Timestamp:

Jun 24, 2024, 8:57:19 AM (2 years ago)

Author:

eugene

Message:

allow mextract to retrieve values from the lensobj and galphot tables

File:

• branches/eam_branches/ipp-20230313/Ohana/src/opihi/dvo/mextract.c (modified) (4 diffs)

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

@@ -221 +221 @@
   }
 
+  int needLensobj = dbFieldNeedLensobj (fields, Nfields);
   int needLensing = dbFieldNeedLensing (fields, Nfields);
   int needStarpar = dbFieldNeedStarpar (fields, Nfields, FALSE);
+  int needGalphot = dbFieldNeedGalphot (fields, Nfields);
 
   // the lensing table does not have a good index to/from the measure table.  if we need lensing
@@ -247 +249 @@
     catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.catflags |= needLensing ? DVO_LOAD_LENSING : DVO_SKIP_LENSING;
+    catalog.catflags |= needLensobj ? DVO_LOAD_LENSOBJ : DVO_SKIP_LENSOBJ;
     catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
+    catalog.catflags |= needGalphot ? DVO_LOAD_GALPHOT : DVO_SKIP_GALPHOT;
     catalog.Nsecfilt = Nsecfilt;
 
@@ -297 +301 @@
         dbExtractMeasuresInitMeas (); // reset counters for saved fields  (costs very little
 
-        int Nstarpar = average->starparOffset;
-        StarPar *starpar = needStarpar && average->Nstarpar ? &catalog.starpar[Nstarpar] : NULL;
+        int nStar = average->starparOffset;
+        StarPar *starpar = needStarpar && average->Nstarpar ? &catalog.starpar[nStar] : NULL;
+
+        int nLens = average->lensobjOffset;
+        Lensobj *lensobj = needLensobj && average->Nlensobj ? &catalog.lensobj[nLens] : NULL;
+
+        int nPhot = average->galphotOffset;
+        GalPhot *galphot = needGalphot && average->Ngalphot ? &catalog.galphot[nPhot] : NULL;
 
         Lensing *lensing = NULL;
@@ -313 +323 @@
 
         for (n = 0; n < Nfields; n++) {
-          values[n] = dbExtractMeasures (average, secfilt, &catalog.measure[m], lensing, starpar, &fields[n]);
+          values[n] = dbExtractMeasures (average, secfilt, lensobj, &catalog.measure[m], lensing, starpar, galphot, &fields[n]);
         }
         // fprintf (stderr, "object: ave: %f, cat: %f, averef %d\n", fields[n].name, values[2], values[3], catalog.measure[m].averef);