Changeset 33963 for trunk/Ohana/src/libdvo/src/dbExtractAverages.c

Timestamp:

May 30, 2012, 1:46:12 PM (14 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20120405

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana/src/libdvo/src/dbExtractAverages.c (modified) (3 diffs)

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

@@ -40 +40 @@
 int dbExtractAveragesInit () {
   GetTimeFormat (&TimeReference, &TimeFormat);
+  return (TRUE);
+}
+
+int dbExtractAveragesInitAve () {
   haveGalactic = FALSE;
   haveEcliptic = FALSE;
@@ -200 +204 @@
           }
           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 +233 @@
           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;