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

Timestamp:

Apr 18, 2015, 6:33:51 AM (11 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20150405: add R7 to lensing, fix R5,R6,R7 definitions and mean photometry; calculate E1,E2 in dvolens; fix precision for dvopsps FW objects; fix histograms at axis; new colormap options; require primary skycell in diff mean photometry

Location:

trunk

Files:

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

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

@@ -89 +89 @@
   MAG_OPTION_F_STDEV_AP_R6, 
   MAG_OPTION_F_FILL_AP_R6, 
+
+  MAG_OPTION_F_AP_R7, 
+  MAG_OPTION_F_ERR_AP_R7, 
+  MAG_OPTION_F_STDEV_AP_R7, 
+  MAG_OPTION_F_FILL_AP_R7, 
+
+  MAG_OPTION_E1, 
+  MAG_OPTION_E2, 
 } dvoMagOptionType;
 
@@ -207 +215 @@
       MEAS_REF_COLOR_BLUE,
       MEAS_REF_COLOR_RED,
+
       MEAS_X11_SM_OBJ, 
       MEAS_X12_SM_OBJ, 
@@ -227 +236 @@
       MEAS_E1_SH_PSF, 
       MEAS_E2_SH_PSF, 
+
+      MEAS_F_AP_R5, 
+      MEAS_F_ERR_AP_R5, 
+      MEAS_F_STDEV_AP_R5, 
+      MEAS_F_FILL_AP_R5, 
+
+      MEAS_F_AP_R6, 
+      MEAS_F_ERR_AP_R6, 
+      MEAS_F_STDEV_AP_R6, 
+      MEAS_F_FILL_AP_R6, 
+
+      MEAS_F_AP_R7, 
+      MEAS_F_ERR_AP_R7, 
+      MEAS_F_STDEV_AP_R7, 
+      MEAS_F_FILL_AP_R7, 
+
       MEAS_E_BV,                      // extinction (mags)
       MEAS_E_BV_ERR,