Changeset 39574

Timestamp:

May 13, 2016, 9:54:58 AM (10 years ago)

Author:

eugene

Message:

handle cases where Nlensobj, Nmeasure, Nstarpar, Ngalphot are 0

Location:

trunk/Ohana/src

Files:

• libdvo/src/dbExtractAverages.c (modified) (10 diffs)
• libdvo/src/dvo_photcode_ops.c (modified) (1 diff)
• opihi/dvo/avextract.c (modified) (2 diffs)

trunk/Ohana/src/libdvo/src/dbExtractAverages.c

@@ -223 +223 @@
             case MAG_LEVEL_INST:
               // find an appropriate measure (if one exists)
-              for (n = 0; n < average->Nmeasure; n++) {
+              for (n = 0; measure && n < average->Nmeasure; n++) {
                 if (field->photcode->code != measure[n].photcode) continue;
                 value.Flt = PhotInst (&measure[n], field->magClass); 
@@ -231 +231 @@
             case MAG_LEVEL_CAT:
               // find an appropriate measure (if one exists)
-              for (n = 0; n < average->Nmeasure; n++) {
+              for (n = 0; measure && n < average->Nmeasure; n++) {
                 if (field->photcode->code != measure[n].photcode) continue;
                 value.Flt = PhotCat (&measure[n], field->magClass); 
@@ -239 +239 @@
             case MAG_LEVEL_SYS:
               // find an appropriate measure (if one exists)
-              for (n = 0; n < average->Nmeasure; n++) {
+              for (n = 0; measure && n < average->Nmeasure; n++) {
                 if (field->photcode->code != measure[n].photcode) continue;
                 value.Flt = PhotSys  (&measure[n], average, secfilt, field->magClass); 
@@ -247 +247 @@
             case MAG_LEVEL_REL:
               // find an appropriate measure (if one exists)
-              for (n = 0; n < average->Nmeasure; n++) {
+              for (n = 0; measure && n < average->Nmeasure; n++) {
                 if (field->photcode->code != measure[n].photcode) continue;
                 value.Flt = PhotRel (&measure[n], average, secfilt, field->magClass); 
@@ -270 +270 @@
             case MAG_LEVEL_REL:
               // find an appropriate measure (if one exists)
-              for (n = 0; n < average->Nmeasure; n++) {
+              for (n = 0; measure && n < average->Nmeasure; n++) {
                 if (field->photcode->code != measure[n].photcode) continue;
                 value.Flt = PhotErr (&measure[n], field->magClass); 
@@ -293 +293 @@
             case MAG_LEVEL_INST:
               // find an appropriate measure (if one exists)
-              for (n = 0; n < average->Nmeasure; n++) {
+              for (n = 0; measure && n < average->Nmeasure; n++) {
                 if (field->photcode->code != measure[n].photcode) continue;
                 value.Flt = PhotFluxInst (&measure[n], field->magClass); 
@@ -301 +301 @@
             case MAG_LEVEL_CAT:
               // find an appropriate measure (if one exists)
-              for (n = 0; n < average->Nmeasure; n++) {
+              for (n = 0; measure && n < average->Nmeasure; n++) {
                 if (field->photcode->code != measure[n].photcode) continue;
                 value.Flt = PhotFluxCat (&measure[n], field->magClass); 
@@ -309 +309 @@
             case MAG_LEVEL_SYS:
               // find an appropriate measure (if one exists)
-              for (n = 0; n < average->Nmeasure; n++) {
+              for (n = 0; measure && n < average->Nmeasure; n++) {
                 if (field->photcode->code != measure[n].photcode) continue;
                 value.Flt = PhotFluxSys (&measure[n], average, secfilt, field->magClass); 
@@ -317 +317 @@
             case MAG_LEVEL_REL:
               // find an appropriate measure (if one exists)
-              for (n = 0; n < average->Nmeasure; n++) {
+              for (n = 0; measure && n < average->Nmeasure; n++) {
                 if (field->photcode->code != measure[n].photcode) continue;
                 value.Flt = PhotFluxRel (&measure[n], average, secfilt, field->magClass); 
@@ -340 +340 @@
             case MAG_LEVEL_REL:
               // find an appropriate measure (if one exists)
-              for (n = 0; n < average->Nmeasure; n++) {
+              for (n = 0; measure && n < average->Nmeasure; n++) {
                 if (field->photcode->code != measure[n].photcode) continue;
                 value.Flt = PhotFluxInstErr (&measure[n], field->magClass); 

trunk/Ohana/src/libdvo/src/dvo_photcode_ops.c

@@ -1915 +1915 @@
 /*** lensing *********************************************************************************/
 
+// lensobj points an Nsecfilt entries, if any exist.  note comment in dvolens/src/update_objects_catalog.c:32
+// >> Nlensobj tracks how many lensobj entries have I actually generated so far for this
+// >> catalog This is not necessarily 1-to-1 with secfilt entries, but any average entry
+// >> will either have 0 or Nsecfilt lensobj entries
+
 # define LENSFIELD(NAME) \
-  float LensValue_##NAME (PhotCode *code, Lensobj *lensobj) { \
-  if (code == NULL) return NAN; \
-  int Ns = photcodes->hashNsec[code->code]; \
-  float value = (Ns == -1) ? NAN : lensobj[Ns].NAME; \
-  return (value); \
-}
+  float LensValue_##NAME (PhotCode *code, Lensobj *lensobj) {   \
+    if (lensobj == NULL) return NAN;                            \
+    if (code == NULL) return NAN;                               \
+    int Ns = photcodes->hashNsec[code->code];                   \
+    float value = (Ns == -1) ? NAN : lensobj[Ns].NAME;          \
+    return (value);                                             \
+  }
 
 LENSFIELD(X11_sm_obj)

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

@@ -212 +212 @@
 
       m = average->measureOffset;
-      Measure *measure = needMeasure ? &catalog.measure[m] : NULL;
+      Measure *measure = needMeasure && average->Nmeasure ? &catalog.measure[m] : NULL;
 
       m = average->lensobjOffset;
-      Lensobj *lensobj = needLensobj ? &catalog.lensobj[m] : NULL;
+      Lensobj *lensobj = needLensobj && average->Nlensobj ? &catalog.lensobj[m] : NULL;
 
       m = average->starparOffset;
-      StarPar *starpar = needStarpar ? &catalog.starpar[m] : NULL;
+      StarPar *starpar = needStarpar && average->Nstarpar ? &catalog.starpar[m] : NULL;
 
       m = average->galphotOffset;
-      GalPhot *galphot = needGalphot ? &catalog.galphot[m] : NULL;
+      GalPhot *galphot = needGalphot && average->Ngalphot ? &catalog.galphot[m] : NULL;
 
       m = j*Nsecfilt;
@@ -227 +227 @@
 
       for (n = 0; n < Nfields; n++) {
-        // we are passing in the *first* measure, but average->Nmeasure gives the count
+        // for Measure, we are passing in the *first* measure, but average->Nmeasure gives the count
+        // for Secfilt, we are passing in the first entry; photcode.equiv gives the entry
+        // for Lensobj, we are passing in the first entry or NULL; photcode.equiv gives the entry
         values[n] = dbExtractAverages (average, secfilt, measure, lensobj, starpar, galphot, &fields[n]);
       }