Changeset 34041 for branches/meh_branches/ppstack_test/Ohana/src/libdvo/include/dvodb.h

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• Ohana/src/libdvo/include/dvodb.h (modified) (7 diffs)

branches/meh_branches/ppstack_test/Ohana/src/libdvo/include/dvodb.h

@@ -1 +1 @@
 # ifndef DVODB_H
 # define DVODB_H
+
+# define MEASURE_HAS_XCCD 1
 
 typedef enum {
@@ -30 +32 @@
       MAG_REF, 
       MAG_ERR, 
+      MAG_STDEV, 
       MAG_AVE_ERR, 
       MAG_PHOT_FLAGS, 
@@ -35 +38 @@
       MAG_NCODE,
       MAG_NPHOT,
+      MAG_20, 
+      MAG_80, 
+      MAG_UC_DIST, 
 };
 
@@ -74 +80 @@
       MEAS_NPOS, 
       MEAS_OBJ_FLAGS, 
+      MEAS_SECFILT_FLAGS, 
       MEAS_MAG, 
       MEAS_MINST, 
@@ -82 +89 @@
       MEAS_EXPTIME, 
       MEAS_AIRMASS, 
+      MEAS_MEAN_AIRMASS, 
       MEAS_ALT, 
       MEAS_AZ, 
       MEAS_PHOTCODE, 
       MEAS_PHOTCODE_EQUIV, 
+      MEAS_PHOTCODE_KLAM, 
+      MEAS_PHOTCODE_C, 
       MEAS_TIME, 
       MEAS_FWHM, 
@@ -120 +130 @@
       MEAS_EXT_NSIGMA, 
       MEAS_EXTERN_ID,
+      MEAS_MCAL_OFFSET,
+      MEAS_FLAT,
 };
 
@@ -319 +331 @@
 
 int dbExtractAveragesInitTransform (CoordTransformSystem target);
+int dbExtractAveragesInitAve (void);
 int dbExtractAveragesInit (void);