Changeset 38986 for trunk/Ohana/src/opihi/dvo/mextract.c

Timestamp:

Oct 27, 2015, 4:49:06 PM (11 years ago)

Author:

eugene

Message:

extensive work on relphot, relastro, uniphot, dvomerge aiming to the construction and calibration of PV3

Location:

trunk/Ohana

Files:

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

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

@@ -213 +213 @@
   }
 
-  // int needLensing = dbFieldNeedLensing (fields, Nfields);
+  int needLensing = dbFieldNeedLensing (fields, Nfields);
   int needStarpar = dbFieldNeedStarpar (fields, Nfields, FALSE);
 
@@ -234 +234 @@
     catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
     catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
-    // catalog.catflags |= needLensing ? DVO_LOAD_LENSING : DVO_SKIP_LENSING;
+    catalog.catflags |= needLensing ? DVO_LOAD_LENSING : DVO_SKIP_LENSING;
     catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
     catalog.Nsecfilt = Nsecfilt;
@@ -274 +274 @@
         StarPar *starpar = needStarpar ? &catalog.starpar[Nstarpar] : NULL;
 
-        // int Nlensing = average->lensobjOffset;
-        // Lensobj *lensobj = needLensobj ? &catalog.lensobj[m] : NULL;
+        int Nlensing = average->lensingOffset;
+        Lensing *lensing = needLensing ? &catalog.lensing[Nlensing] : NULL;
 
         int Nsec = j*Nsecfilt;
@@ -281 +281 @@
 
         for (n = 0; n < Nfields; n++) {
-          values[n] = dbExtractMeasures (average, secfilt, &catalog.measure[m], NULL, starpar, &fields[n]);
+          values[n] = dbExtractMeasures (average, secfilt, &catalog.measure[m], lensing, starpar, &fields[n]);
         }
         // fprintf (stderr, "object: ave: %f, cat: %f, averef %d\n", fields[n].name, values[2], values[3], catalog.measure[m].averef);