Changeset 40477 for branches/czw_branch/20170908/Ohana/src/libdvo/include/dvodb.h

Timestamp:

Jun 27, 2018, 3:20:35 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/Ohana

Files:

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

branches/czw_branch/20170908/Ohana/src/libdvo/include/dvodb.h

@@ -3 +3 @@
 
 # define MEASURE_HAS_XCCD 1
+
+// Some values used by code moved to libdvo from opihi.
+enum {OPIHI_NOTYPE, OPIHI_FLT, OPIHI_INT};
+# define opihi_flt double
+// # define opihi_int int64_t
+# define opihi_int long long int
+# define OPIHI_INT_FMT "%lld"
 
 typedef enum {
@@ -120 +127 @@
   MAG_OPTION_GAL_FLAGS,        
   MAG_OPTION_GAL_TYPE,        
+
+  MAG_OPTION_GAL_OBJ_ID,  
+  MAG_OPTION_GAL_CAT_ID,  
+  MAG_OPTION_GAL_DET_ID, 
+  MAG_OPTION_GAL_IMAGE_ID,
 } dvoMagOptionType;
 
@@ -236 +248 @@
       MEAS_EXTERN_ID,
       MEAS_EXPNAME_AS_INT,
-      MEAS_MCAL_OFFSET, // make this a dvoMagOption?
+      MEAS_MCAL_OFFSET_PSF, // make this a dvoMagOption?
+      MEAS_MCAL_OFFSET_APER, // make this a dvoMagOption?
       MEAS_FLAT,
       MEAS_CENTER_OFFSET,
@@ -369 +382 @@
       IMAGE_XM, 
       IMAGE_AIRMASS, 
-      IMAGE_MCAL, 
+      IMAGE_MCAL_PSF, 
+      IMAGE_MCAL_APER, 
       IMAGE_dMCAL, 
       IMAGE_PHOTCODE, 
@@ -471 +485 @@
   char    type;
   int     field;
-  // opihi_flt FltValue;
-  // opihi_int IntValue;
-  double FltValue;
-  int IntValue;
+  opihi_flt FltValue;
+  opihi_int IntValue;
+  // double FltValue;
+  // int IntValue;
 } dbStack;
 
 typedef struct {
-  // opihi_flt Flt;
-  // opihi_int Int;
-  double Flt;
-  int Int;
+  opihi_flt Flt;
+  opihi_int Int;
+  // double Flt;
+  // int Int;
 } dbValue;
 
@@ -562 +576 @@
 int dbExtractImagesReset (void);
 
-// Some values used by code moved to libdvo from opihi.
-enum {OPIHI_NOTYPE, OPIHI_FLT, OPIHI_INT};
-#define opihi_flt double
-#define opihi_int int
-
 #include "get_graphdata.h"