Changeset 33936 for branches/eam_branches/ipp-20120405/Ohana

Timestamp:

May 26, 2012, 2:11:41 PM (14 years ago)

Author:

eugene

Message:

add average field options for mag:stdev, mag:20, mag:80, mag:ucdist

Location:

branches/eam_branches/ipp-20120405/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (1 diff)
• include/dvodb.h (modified) (2 diffs)
• src/dbExtractAverages.c (modified) (2 diffs)
• src/dbFields.c (modified) (1 diff)
• src/dvo_photcode_ops.c (modified) (1 diff)

branches/eam_branches/ipp-20120405/Ohana/src/libdvo/include/dvo.h

@@ -456 +456 @@
 float PhotdM (PhotCode *code, Average *average, SecFilt *secfilt);
 
+float PhotMstdev (PhotCode *code, Average *average, SecFilt *secfilt);
+float PhotM20 (PhotCode *code, Average *average, SecFilt *secfilt);
+float PhotM80 (PhotCode *code, Average *average, SecFilt *secfilt);
+float PhotUCdist (PhotCode *code, Average *average, SecFilt *secfilt);
+
 float PhotColorForCode (Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code);
 int PhotColor (Average *average, SecFilt *secfilt, Measure *measure, int c1, int c2, double *color);

branches/eam_branches/ipp-20120405/Ohana/src/libdvo/include/dvodb.h

@@ -32 +32 @@
       MAG_REF, 
       MAG_ERR, 
+      MAG_STDEV, 
       MAG_AVE_ERR, 
       MAG_PHOT_FLAGS, 
@@ -37 +38 @@
       MAG_NCODE,
       MAG_NPHOT,
+      MAG_20, 
+      MAG_80, 
+      MAG_UC_DIST, 
 };
 

branches/eam_branches/ipp-20120405/Ohana/src/libdvo/src/dbExtractAverages.c

@@ -200 +200 @@
           }
           break;
+        case MAG_STDEV:
+          value.Flt = PhotMstdev (field->photcode, average, secfilt);
+          break;
         case MAG_PHOT_FLAGS:
           if ((field->photcode->type == PHOT_REF) || (field->photcode->type == PHOT_DEP)) {
@@ -226 +229 @@
           break;
 
+        case MAG_20:
+          value.Flt = PhotM20 (field->photcode, average, secfilt);
+          break;
+        case MAG_80:
+          value.Flt = PhotM80 (field->photcode, average, secfilt);
+          break;
+        case MAG_UC_DIST:
+          value.Flt = PhotUCdist (field->photcode, average, secfilt);
+          break;
       }
       break;

branches/eam_branches/ipp-20120405/Ohana/src/libdvo/src/dbFields.c

@@ -46 +46 @@
   if (!strcasecmp (string, "ncode"))     return (MAG_NCODE);
   if (!strcasecmp (string, "nphot"))     return (MAG_NPHOT);
+  if (!strcasecmp (string, "stdev"))     return (MAG_STDEV);
+  if (!strcasecmp (string, "20"))        return (MAG_20);
+  if (!strcasecmp (string, "80"))        return (MAG_80);
+  if (!strcasecmp (string, "ucdist"))    return (MAG_UC_DIST);
   return (MAG_NONE);
 }

branches/eam_branches/ipp-20120405/Ohana/src/libdvo/src/dvo_photcode_ops.c

@@ -476 +476 @@
 }
 
+float PhotMstdev (PhotCode *code, Average *average, SecFilt *secfilt) {
+
+  int Ns;
+  float Mstdev;
+
+  if (code == NULL) return NAN;
+
+  Ns = photcodes[0].hashNsec[code[0].code];
+  Mstdev  = (Ns == -1) ? NAN : 0.001*secfilt[Ns].Mstdev;
+  return (Mstdev);
+}
+
+float PhotM20 (PhotCode *code, Average *average, SecFilt *secfilt) {
+
+  int Ns;
+  float M20;
+
+  if (code == NULL) return NAN;
+
+  Ns = photcodes[0].hashNsec[code[0].code];
+  M20  = (Ns == -1) ? NAN : 0.001*secfilt[Ns].M_20;
+  return (M20);
+}
+
+float PhotM80 (PhotCode *code, Average *average, SecFilt *secfilt) {
+
+  int Ns;
+  float M80;
+
+  if (code == NULL) return NAN;
+
+  Ns = photcodes[0].hashNsec[code[0].code];
+  M80  = (Ns == -1) ? NAN : 0.001*secfilt[Ns].M_80;
+  return (M80);
+}
+
+float PhotUCdist (PhotCode *code, Average *average, SecFilt *secfilt) {
+
+  int Ns;
+  float Muc;
+
+  if (code == NULL) return NAN;
+
+  Ns = photcodes[0].hashNsec[code[0].code];
+  Muc  = (Ns == -1) ? NAN : secfilt[Ns].ubercalDist;
+  return (Muc);
+}
+
 // XXX return NAN or NAN_S_SHORT? (secfilt->Xm is short)
 float PhotXm (PhotCode *code, Average *average, SecFilt *secfilt) {