Changeset 20936 for trunk/Ohana/src/opihi/dvo/dbExtractAverages.c

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/dvo/dbExtractAverages.c (modified) (11 diffs)

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

@@ -40 +40 @@
 
 /* return average.field based on the selection */
-double dbExtractAverages (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) {
+dbValue dbExtractAverages (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) {
 
   int i, Nsec;
-  double value;
+  dbValue value;
 
-  value = NAN;
+  value.Flt = NAN;
+  value.Int =   0;
 
   /* assign vector values */
   switch (field->ID) {
     case AVE_RA:
-      value = average[0].R;
+      value.Flt = average[0].R;
       break;
     case AVE_DEC:
-      value = average[0].D;
+      value.Flt = average[0].D;
       break;
     case AVE_GLON:
@@ -60 +61 @@
         haveGalactic = TRUE;
       }
-      value = GLON;
+      value.Flt = GLON;
       break;
     case AVE_GLAT:
@@ -67 +68 @@
         haveGalactic = TRUE;
       }
-      value = GLAT;
+      value.Flt = GLAT;
       break;
     case AVE_ELON:
@@ -74 +75 @@
         haveEcliptic = TRUE;
       }
-      value = ELON;
+      value.Flt = ELON;
       break;
     case AVE_ELAT:
@@ -81 +82 @@
         haveEcliptic = TRUE;
       }
-      value = ELAT;
+      value.Flt = ELAT;
       break;
     case AVE_RA_ERR:
-      value = average[0].dR;
+      value.Flt = average[0].dR;
       break;
     case AVE_DEC_ERR:
-      value = average[0].dD;
+      value.Flt = average[0].dD;
       break;
 
     case AVE_U_RA:
-      value = average[0].uR;
+      value.Flt = average[0].uR;
       break;
     case AVE_U_DEC:
-      value = average[0].uD;
+      value.Flt = average[0].uD;
       break;
     case AVE_U_RA_ERR:
-      value = average[0].duR;
+      value.Flt = average[0].duR;
       break;
     case AVE_U_DEC_ERR:
-      value = average[0].duD;
+      value.Flt = average[0].duD;
       break;
 
     case AVE_PAR:
-      value = average[0].P;
+      value.Flt = average[0].P;
       break;
     case AVE_PAR_ERR:
-      value = average[0].dP;
+      value.Flt = average[0].dP;
       break;
 
     case AVE_NMEAS:
-      value = average[0].Nmeasure;
+      value.Int = average[0].Nmeasure;
       break;
     case AVE_NMISS:
-      value = average[0].Nmissing;
+      value.Int = average[0].Nmissing;
       break;
     case AVE_Xp:
-      value = 0.01*average[0].Xp;
+      value.Flt = 0.01*average[0].Xp;
       break;
     case AVE_FLAG:
-      value = average[0].code;
+      value.Int = average[0].code;
+      break;
+    case AVE_OBJID:
+      value.Int = average[0].objID;
+      break;
+    case AVE_CATID:
+      value.Int = average[0].catID;
       break;
 
@@ -126 +133 @@
       switch (field->magMode) {
         case MAG_AVE:
-          value = PhotAve  (field->photcode, average, secfilt);
+          value.Flt = PhotAve  (field->photcode, average, secfilt);
           break;
         case MAG_REF:
-          value = PhotRef  (field->photcode, average, secfilt, measure);
+          value.Flt = PhotRef  (field->photcode, average, secfilt, measure);
           break;
         case MAG_INST:
@@ -137 +144 @@
         case MAG_CAL:
           // XXX need to code this correctly: this returns just the first matching value
-          value = NAN;
+          value.Flt = NAN;
           for (i = 0; i < average[0].Nmeasure; i++) {
             if (field->photcode->code != measure[i].photcode) continue;
-            value = measure[i].M;
+            value.Flt = measure[i].M;
             break;
           }
@@ -146 +153 @@
         case MAG_CHISQ:
           // GetPhotcodeEquivCodebyCode (field->photcode)
-          value = PhotXm (field->photcode, average, secfilt);
+          value.Flt = PhotXm (field->photcode, average, secfilt);
           break;
         case MAG_ERR:
           // GetPhotcodeEquivCodebyCode (field->photcode)
-          if (field->photcode->type == PHOT_REF) {
+          if ((field->photcode->type == PHOT_REF) || (field->photcode->type == PHOT_DEP)) {
             for (i = 0; i < average[0].Nmeasure; i++) {
               if (field->photcode->code != measure[i].photcode) continue;
-              value = measure[i].dM;
+              value.Flt = measure[i].dM;
               break;
             }
           } else {
-            value = PhotdM (field->photcode, average, secfilt);
+            value.Flt = PhotdM (field->photcode, average, secfilt);
           }
           break;
@@ -165 +172 @@
           Nsec = GetPhotcodeNsec (field->photcode->code);
           if (Nsec == -1) break;
-          value = secfilt[Nsec].Ncode;
+          value.Int = secfilt[Nsec].Ncode;
           break;
         case MAG_NPHOT:
           Nsec = GetPhotcodeNsec (field->photcode->code);
           if (Nsec == -1) break;
-          value = secfilt[Nsec].Nused;
+          value.Int = secfilt[Nsec].Nused;
           break;
 
@@ -176 +183 @@
       break;
     case AVE_dMAG:
-      value = PhotdM (field->photcode, average, secfilt);
+      value.Flt = PhotdM (field->photcode, average, secfilt);
       break;
     case AVE_Xm:
-      value = PhotXm (field->photcode, average, secfilt);
+      value.Flt = PhotXm (field->photcode, average, secfilt);
       break;
     case AVE_TYPE:
@@ -185 +192 @@
     case AVE_TYPEFRAC:
       break;
-      /*
-    case AVE_NCODE:
-      value = 0;
-      for (i = 0; i < average[0].Nm; i++) {
-        if (field->photcode->code != GetPhotcodeEquivCodebyCode (measure[i].photcode)) continue;
-        value ++;
-      }
-      break;
-    case AVE_NPHOT:
-      value = 0;
-      for (i = 0; i < average[0].Nm; i++) {
-        if (field->photcode->code != GetPhotcodeEquivCodebyCode (measure[i].photcode)) continue;
-        if (measure[i].flags & (ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM)) continue;
-        value ++;
-      }
-      break;
-    case AVE_NCRIT:
-      break;
-      */
   }
   return (value);