Index: /trunk/Ohana/src/libdvo/src/cmf-ps1-v5-r0-lensing.c
===================================================================
--- /trunk/Ohana/src/libdvo/src/cmf-ps1-v5-r0-lensing.c	(revision 38894)
+++ /trunk/Ohana/src/libdvo/src/cmf-ps1-v5-r0-lensing.c	(revision 38895)
@@ -269,24 +269,24 @@
   gfits_define_bintable_column (header, "E",    "MOMENTS_M4C",      "fourth moment cos(t)",            "pixels^4",          1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "MOMENTS_M4S",      "fourth moment sin(t)",            "pixels^4",          1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SM_OBJ",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SM_OBJ",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SH_OBJ",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SH_OBJ",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SM_PSF",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SM_PSF",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SM_OBJ",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SM_OBJ",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SH_OBJ",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SH_OBJ",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SM_PSF",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SM_PSF",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SH_PSF",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SH_PSF",   "lensing shear",                   "",                  1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "MOMENTS_R1",       "first radial moment",             "pixels",            1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "MOMENTS_RH",       "half radial moment",              "pixels^1/2",        1.0, 0.0);
@@ -365,24 +365,24 @@
   gfits_define_bintable_column (header, "E",    "MOMENTS_M4C",      "fourth moment cos(t)",            "pixels^4",          1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "MOMENTS_M4S",      "fourth moment sin(t)",            "pixels^4",          1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SM_OBJ",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SM_OBJ",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SH_OBJ",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SH_OBJ",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SM_PSF",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SM_PSF",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SM_OBJ",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SM_OBJ",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SH_OBJ",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SH_OBJ",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SM_PSF",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SM_PSF",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SH_PSF",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SH_PSF",   "lensing shear",                   "",                  1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "MOMENTS_R1",       "first radial moment",             "pixels",            1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "MOMENTS_RH",       "half radial moment",              "pixels^1/2",        1.0, 0.0);
Index: /trunk/Ohana/src/libdvo/src/cmf-ps1-v5-r1-lensing.c
===================================================================
--- /trunk/Ohana/src/libdvo/src/cmf-ps1-v5-r1-lensing.c	(revision 38894)
+++ /trunk/Ohana/src/libdvo/src/cmf-ps1-v5-r1-lensing.c	(revision 38895)
@@ -275,24 +275,24 @@
   gfits_define_bintable_column (header, "E",    "MOMENTS_M4C",      "fourth moment cos(t)",            "pixels^4",          1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "MOMENTS_M4S",      "fourth moment sin(t)",            "pixels^4",          1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SM_OBJ",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SM_OBJ",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SH_OBJ",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SH_OBJ",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SM_PSF",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SM_PSF",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SM_OBJ",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SM_OBJ",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SH_OBJ",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SH_OBJ",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SM_PSF",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SM_PSF",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SH_PSF",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SH_PSF",   "lensing shear",                   "",                  1.0, 0.0);
 
   gfits_define_bintable_column (header, "I",    "SRC_CHIP_NUM",     "number of source chip for warp",  "",                  1.0, 0.0);
@@ -377,24 +377,24 @@
   gfits_define_bintable_column (header, "E",    "MOMENTS_M4C",      "fourth moment cos(t)",            "pixels^4",          1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "MOMENTS_M4S",      "fourth moment sin(t)",            "pixels^4",          1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SM_OBJ",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SM_OBJ",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SH_OBJ",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SH_OBJ",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SM_PSF",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SM_PSF",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SM_OBJ",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SM_OBJ",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SH_OBJ",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SH_OBJ",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SM_PSF",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SM_PSF",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SH_PSF",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SH_PSF",   "lensing shear",                   "",                  1.0, 0.0);
 
   gfits_define_bintable_column (header, "I",    "SRC_CHIP_NUM",     "number of source chip for warp",  "",                  1.0, 0.0);
Index: /trunk/Ohana/src/libdvo/src/cmf-ps1-v5-r2-lensing.c
===================================================================
--- /trunk/Ohana/src/libdvo/src/cmf-ps1-v5-r2-lensing.c	(revision 38894)
+++ /trunk/Ohana/src/libdvo/src/cmf-ps1-v5-r2-lensing.c	(revision 38895)
@@ -278,26 +278,26 @@
   gfits_define_bintable_column (header, "E",    "MOMENTS_M4C",      "fourth moment cos(t)",            "pixels^4",          1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "MOMENTS_M4S",      "fourth moment sin(t)",            "pixels^4",          1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SM_OBJ",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SM_OBJ",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SH_OBJ",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SH_OBJ",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SM_PSF",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SM_PSF",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_PSF",           "psf polarization",                "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_PSF",           "psf polarization",                "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SM_OBJ",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SM_OBJ",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SH_OBJ",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SH_OBJ",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SM_PSF",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SM_PSF",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SH_PSF",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SH_PSF",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_PSF",      "psf polarization",                "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_PSF",      "psf polarization",                "",                  1.0, 0.0);
 
   gfits_define_bintable_column (header, "I",    "SRC_CHIP_NUM",     "number of source chip for warp",  "",                  1.0, 0.0);
@@ -382,26 +382,26 @@
   gfits_define_bintable_column (header, "E",    "MOMENTS_M4C",      "fourth moment cos(t)",            "pixels^4",          1.0, 0.0);
   gfits_define_bintable_column (header, "E",    "MOMENTS_M4S",      "fourth moment sin(t)",            "pixels^4",          1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SM_OBJ",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SM_OBJ",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SM_OBJ",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SH_OBJ",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SH_OBJ",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SH_OBJ",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SM_PSF",       "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SM_PSF",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SM_PSF",        "lensing smear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X11_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X12_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "X22_SH_PSF",       "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E1_PSF",           "psf polarization",                "",                  1.0, 0.0);
-  gfits_define_bintable_column (header, "E",    "E2_PSF",           "psf polarization",                "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SM_OBJ",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SM_OBJ",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SM_OBJ",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SH_OBJ",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SH_OBJ",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SH_OBJ",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SM_PSF",  "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SM_PSF",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SM_PSF",   "lensing smear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X11_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X12_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_X22_SH_PSF",  "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_SH_PSF",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_SH_PSF",   "lensing shear",                   "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E1_PSF",      "psf polarization",                "",                  1.0, 0.0);
+  gfits_define_bintable_column (header, "E",    "LENS_E2_PSF",      "psf polarization",                "",                  1.0, 0.0);
 
   gfits_define_bintable_column (header, "I",    "SRC_CHIP_NUM",     "number of source chip for warp",  "",                  1.0, 0.0);
