Changeset 38062 for trunk/Ohana/src/libdvo/include/dvodb.h

Timestamp:

Mar 29, 2015, 6:52:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from ipp-20150112

Location:

trunk

Files:

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

trunk/Ohana/src/libdvo/include/dvodb.h

@@ -178 +178 @@
       MEAS_XOFF_DCR, 
       MEAS_YOFF_DCR, 
+      MEAS_XOFF_CAM, 
+      MEAS_YOFF_CAM, 
       MEAS_ROFF_GAL, 
       MEAS_DOFF_GAL, 
@@ -237 +239 @@
       MEAS_RA_GALMODEL,      // model pm prediction
       MEAS_DEC_GALMODEL,     // model pm prediction
-};
+} dvoMeasureType;
 
 /* average fields */
@@ -289 +291 @@
       AVE_RA_GALMODEL,      // model pm prediction
       AVE_DEC_GALMODEL,     // model pm prediction
-};
+} dvoAverageType;
 
 //       AVE_NPHOT, 
@@ -365 +367 @@
       IMAGE_REF_COLOR_BLUE,
       IMAGE_REF_COLOR_RED
-};
+} dvoImageType;
 
 enum {DVO_TABLE_AVERAGE, DVO_TABLE_MEASURE, DVO_TABLE_IMAGE};
@@ -383 +385 @@
   int extract;
   int table;
-  int ID;
+  int ID; // may be either dvoMeasureType or dvoAverageType
 
   dvoMagSourceType magSource; // chip, (forced) warp, stack [only relevant for averages]