Index: /branches/eam_branches/ipp-20150405/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c
===================================================================
--- /branches/eam_branches/ipp-20150405/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c	(revision 38149)
+++ /branches/eam_branches/ipp-20150405/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c	(revision 38150)
@@ -188,8 +188,14 @@
 		 "FLUX_STD_AP_R5     FLOAT, "
 		 "FLUX_FIL_AP_R5     FLOAT, "
+
 		 "FLUX_AP_R6         FLOAT, "
 		 "FLUX_ERR_AP_R6     FLOAT, "
 		 "FLUX_STD_AP_R6     FLOAT, "
 		 "FLUX_FIL_AP_R6     FLOAT, "
+
+		 "FLUX_AP_R7         FLOAT, "
+		 "FLUX_ERR_AP_R7     FLOAT, "
+		 "FLUX_STD_AP_R7     FLOAT, "
+		 "FLUX_FIL_AP_R7     FLOAT, "
 
 		 "X11_SM_OBJ         FLOAT, "
@@ -281,8 +287,14 @@
 		 "FLUX_STD_AP_R5, "
 		 "FLUX_FIL_AP_R5, "
+
 		 "FLUX_AP_R6, "
 		 "FLUX_ERR_AP_R6, "
 		 "FLUX_STD_AP_R6, "
 		 "FLUX_FIL_AP_R6, "
+
+		 "FLUX_AP_R7, "
+		 "FLUX_ERR_AP_R7, "
+		 "FLUX_STD_AP_R7, "
+		 "FLUX_FIL_AP_R7, "
 
 		 "X11_SM_OBJ, "
@@ -367,15 +379,15 @@
 
     // use %e?
-    PRINT_FLOAT(sec_buffer, meanPSFFlux,      "%.6f, "); // uflux precision
-    PRINT_FLOAT(sec_buffer, meanPSFFluxErr,   "%.6f, "); // uflux precision
-    PRINT_FLOAT(sec_buffer, meanPSFFluxStd,   "%.6f, "); // uflux precision
-
-    PRINT_FLOAT(sec_buffer, meanKronFlux,     "%.6f, "); // uflux precision
-    PRINT_FLOAT(sec_buffer, meanKronFluxErr,  "%.6f, "); // uflux precision
-    PRINT_FLOAT(sec_buffer, meanKronFluxStd,  "%.6f, "); // uflux precision
-
-    PRINT_FLOAT(sec_buffer, meanApFlux,     "%.6f, "); // uflux precision
-    PRINT_FLOAT(sec_buffer, meanApFluxErr,  "%.6f, "); // uflux precision
-    PRINT_FLOAT(sec_buffer, meanApFluxStd,  "%.6f, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanPSFFlux,      "%.6e, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanPSFFluxErr,   "%.6e, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanPSFFluxStd,   "%.6e, "); // uflux precision
+
+    PRINT_FLOAT(sec_buffer, meanKronFlux,     "%.6e, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanKronFluxErr,  "%.6e, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanKronFluxStd,  "%.6e, "); // uflux precision
+
+    PRINT_FLOAT(sec_buffer, meanApFlux,     "%.6e, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanApFluxErr,  "%.6e, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanApFluxStd,  "%.6e, "); // uflux precision
 
     PrintIOBuffer (sec_buffer, "%u ", secfilt->flags);       
@@ -390,38 +402,39 @@
     PrintIOBuffer (cpy_buffer, "%hd, ", lensobj->photcode);          
 
-    PRINT_FLOAT(cpy_buffer, lensobj-> F_ApR5,     "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->dF_ApR5,     "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->sF_ApR5,     "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->fF_ApR5,     "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj-> F_ApR6,     "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->dF_ApR6,     "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->sF_ApR6,     "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->fF_ApR6,     "%.8f, ");
-
-    PRINT_FLOAT(cpy_buffer, lensobj->X11_sm_obj,  "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->X12_sm_obj,  "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->X22_sm_obj,  "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->E1_sm_obj,   "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->E2_sm_obj,   "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->X11_sh_obj,  "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->X12_sh_obj,  "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->X22_sh_obj,  "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->E1_sh_obj,   "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->E2_sh_obj,   "%.8f, ");
-
-    PRINT_FLOAT(cpy_buffer, lensobj->X11_sm_psf,  "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->X12_sm_psf,  "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->X22_sm_psf,  "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->E1_sm_psf,   "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->E2_sm_psf,   "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->X11_sh_psf,  "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->X12_sh_psf,  "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->X22_sh_psf,  "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->E1_sh_psf,   "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->E2_sh_psf,   "%.8f, ");
-
-    PRINT_FLOAT(cpy_buffer, lensobj->gamma,       "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->E1, 	  "%.8f, ");
-    PRINT_FLOAT(cpy_buffer, lensobj->E2, 	  "%.8f, ");
+    PRINT_FLOAT(cpy_buffer, lensobj-> F_ApR5,     "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->dF_ApR5,     "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->sF_ApR5,     "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->fF_ApR5,     "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj-> F_ApR6,     "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->dF_ApR6,     "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->sF_ApR6,     "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->fF_ApR6,     "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj-> F_ApR7,     "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->dF_ApR7,     "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->sF_ApR7,     "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->fF_ApR7,     "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->X11_sm_obj,  "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->X12_sm_obj,  "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->X22_sm_obj,  "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->E1_sm_obj,   "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->E2_sm_obj,   "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->X11_sh_obj,  "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->X12_sh_obj,  "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->X22_sh_obj,  "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->E1_sh_obj,   "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->E2_sh_obj,   "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->X11_sm_psf,  "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->X12_sm_psf,  "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->X22_sm_psf,  "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->E1_sm_psf,   "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->E2_sm_psf,   "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->X11_sh_psf,  "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->X12_sh_psf,  "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->X22_sh_psf,  "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->E1_sh_psf,   "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->E2_sh_psf,   "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->gamma,       "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->E1, 	  "%.6e, ");
+    PRINT_FLOAT(cpy_buffer, lensobj->E2, 	  "%.6e, ");
 
     PrintIOBuffer (cpy_buffer, "%u ", lensobj->Nmeas); // NOTE: PRINT_FLOAT always adds a trailing comma -- need to use a different method on the last entry
Index: /branches/eam_branches/ipp-20150405/Ohana/src/dvopsps/src/insert_diffobj_dvopsps_catalog.c
===================================================================
--- /branches/eam_branches/ipp-20150405/Ohana/src/dvopsps/src/insert_diffobj_dvopsps_catalog.c	(revision 38149)
+++ /branches/eam_branches/ipp-20150405/Ohana/src/dvopsps/src/insert_diffobj_dvopsps_catalog.c	(revision 38150)
@@ -258,15 +258,15 @@
 
     // use %e?
-    PRINT_FLOAT(sec_buffer, meanPSFFlux,      "%.6f, "); // uflux precision
-    PRINT_FLOAT(sec_buffer, meanPSFFluxErr,   "%.6f, "); // uflux precision
-    PRINT_FLOAT(sec_buffer, meanPSFFluxStd,   "%.6f, "); // uflux precision
-
-    PRINT_FLOAT(sec_buffer, meanKronFlux,     "%.6f, "); // uflux precision
-    PRINT_FLOAT(sec_buffer, meanKronFluxErr,  "%.6f, "); // uflux precision
-    PRINT_FLOAT(sec_buffer, meanKronFluxStd,  "%.6f, "); // uflux precision
-
-    PRINT_FLOAT(sec_buffer, meanApFlux,     "%.6f, "); // uflux precision
-    PRINT_FLOAT(sec_buffer, meanApFluxErr,  "%.6f, "); // uflux precision
-    PRINT_FLOAT(sec_buffer, meanApFluxStd,  "%.6f, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanPSFFlux,      "%.6e, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanPSFFluxErr,   "%.6e, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanPSFFluxStd,   "%.6e, "); // uflux precision
+
+    PRINT_FLOAT(sec_buffer, meanKronFlux,     "%.6e, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanKronFluxErr,  "%.6e, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanKronFluxStd,  "%.6e, "); // uflux precision
+
+    PRINT_FLOAT(sec_buffer, meanApFlux,     "%.6e, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanApFluxErr,  "%.6e, "); // uflux precision
+    PRINT_FLOAT(sec_buffer, meanApFluxStd,  "%.6e, "); // uflux precision
 
     PrintIOBuffer (sec_buffer, "%u ", secfilt->flags);