Changeset 38983 for branches/eam_branches/ipp-20150625/Ohana/src/opihi/dvo/avextract.c

Timestamp:

Oct 27, 2015, 4:19:52 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk (mostly updates to dvopsps and loadgalphot)

Location:

branches/eam_branches/ipp-20150625/Ohana

Files:

• . (modified) (1 prop)
• src/opihi (modified) (1 prop)
• src/opihi/dvo/avextract.c (modified) (4 diffs)

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

@@ -167 +167 @@
   int needLensobj = dbFieldNeedLensobj (fields, Nfields);
   int needStarpar = dbFieldNeedStarpar (fields, Nfields, TRUE);
+  int needGalphot = dbFieldNeedGalphot (fields, Nfields);
 
   // grab data from all selected sky regions
@@ -191 +192 @@
     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 = 0;
 
@@ -219 +221 @@
       StarPar *starpar = needStarpar ? &catalog.starpar[m] : NULL;
 
+      m = average->galphotOffset;
+      GalPhot *galphot = needGalphot ? &catalog.galphot[m] : NULL;
+
       m = j*Nsecfilt;
       SecFilt *secfilt = &catalog.secfilt[m];
@@ -224 +229 @@
       for (n = 0; n < Nfields; n++) {
         // we are passing in the *first* measure, but average->Nmeasure gives the count
-        values[n] = dbExtractAverages (average, secfilt, measure, lensobj, starpar, &fields[n]);
+        values[n] = dbExtractAverages (average, secfilt, measure, lensobj, starpar, galphot, &fields[n]);
       }