Index: trunk/Ohana/src/addstar/src/ReadStarsFITS.c
===================================================================
--- trunk/Ohana/src/addstar/src/ReadStarsFITS.c	(revision 37994)
+++ trunk/Ohana/src/addstar/src/ReadStarsFITS.c	(revision 37995)
@@ -1217,4 +1217,7 @@
     stars[i].lensing->E2_sh_psf   = ps1data[i].E2_sh_psf;
 
+    stars[i].lensing->E1_psf      = ps1data[i].E1_psf;
+    stars[i].lensing->E2_psf      = ps1data[i].E2_psf;
+
     // stars[i].lensing->F_ApR5    = ps1data[i].F_ApR5;
     // stars[i].lensing->dF_ApR5   = ps1data[i].dF_ApR5;
Index: trunk/Ohana/src/addstar/src/mkcmf.c
===================================================================
--- trunk/Ohana/src/addstar/src/mkcmf.c	(revision 37994)
+++ trunk/Ohana/src/addstar/src/mkcmf.c	(revision 37995)
@@ -1003,10 +1003,10 @@
 
   int i;
-  CMF_PS1_V5_Lensing *stars;
+  CMF_PS1_V5_R2_Lensing *stars;
   float flux, fSN;
 
   // XXX add gaussian-distributed noise based on counts
   // this needs to make different output 'stars' entries depending on the desired type
-  ALLOCATE (stars, CMF_PS1_V5_Lensing, Nstars);
+  ALLOCATE (stars, CMF_PS1_V5_R2_Lensing, Nstars);
   for (i = 0; i < Nstars; i++) {
 
@@ -1129,5 +1129,5 @@
   }
 
-  gfits_table_set_CMF_PS1_V5_Lensing (ftable, stars, Nstars);
+  gfits_table_set_CMF_PS1_V5_R2_Lensing (ftable, stars, Nstars);
   gfits_modify (ftable->header, "EXTTYPE",   "%s", 1, "PS1_V5");
 }
Index: trunk/Ohana/src/libautocode/Makefile.Targets
===================================================================
--- trunk/Ohana/src/libautocode/Makefile.Targets	(revision 37994)
+++ trunk/Ohana/src/libautocode/Makefile.Targets	(revision 37995)
@@ -45,6 +45,7 @@
 $(ASRC)/measure-ps1-ref.$(ARCH).o \
 $(ASRC)/lensing.$(ARCH).o \
-$(ASRC)/lensing-ps1-v5.$(ARCH).o \
-$(ASRC)/lensing-ps1-v5-alt.$(ARCH).o \
+$(ASRC)/lensing-ps1-v5-r0.$(ARCH).o \
+$(ASRC)/lensing-ps1-v5-r1.$(ARCH).o \
+$(ASRC)/lensing-ps1-v5-r2.$(ARCH).o \
 $(ASRC)/lensobj.$(ARCH).o \
 $(ASRC)/lensobj-ps1-v5.$(ARCH).o \
@@ -152,6 +153,7 @@
 $(AINC)/measure-ps1-ref.h \
 $(AINC)/lensing.h \
-$(AINC)/lensing-ps1-v5.h \
-$(AINC)/lensing-ps1-v5-alt.h \
+$(AINC)/lensing-ps1-v5-r0.h \
+$(AINC)/lensing-ps1-v5-r1.h \
+$(AINC)/lensing-ps1-v5-r2.h \
 $(AINC)/lensobj.h \
 $(AINC)/lensobj-ps1-v5.h \
Index: trunk/Ohana/src/libautocode/def/lensing-ps1-v5-r0.d
===================================================================
--- trunk/Ohana/src/libautocode/def/lensing-ps1-v5-r0.d	(revision 37994)
+++ trunk/Ohana/src/libautocode/def/lensing-ps1-v5-r0.d	(revision 37995)
@@ -1,4 +1,4 @@
 STRUCT       Lensing_PS1_V5_R0
-EXTNAME      DVO_LENSING_PS1_V5_R0
+EXTNAME      DVO_LENSING_PS1_V5
 TYPE         BINTABLE
 SIZE         128
Index: trunk/Ohana/src/libdvo/include/ps1_v5_defs.h
===================================================================
--- trunk/Ohana/src/libdvo/include/ps1_v5_defs.h	(revision 37994)
+++ trunk/Ohana/src/libdvo/include/ps1_v5_defs.h	(revision 37995)
@@ -8,9 +8,14 @@
 SecFilt_PS1_V5          *SecFiltInternalTo_PS1_V5 (SecFilt *in, off_t Nvalues);
 
+typedef Lensing_PS1_V5_R2 Lensing_PS1_V5;
+
 Lensing 	       	*Lensing_PS1_V5_ToInternal (Lensing_PS1_V5 *in, off_t Nvalues);
-Lensing 	       	*Lensing_PS1_V5_ALT_ToInternal (Lensing_PS1_V5_ALT *in, off_t Nvalues);
-Lensing_PS1_V5          *LensingInternalTo_PS1_V5 (Lensing *in, off_t Nvalues);
+Lensing_PS1_V5_R2       *LensingInternalTo_PS1_V5_R2 (Lensing *in, off_t Nvalues);
 Lensobj 	       	*Lensobj_PS1_V5_ToInternal (Lensobj_PS1_V5 *in, off_t Nvalues);
 Lensobj_PS1_V5          *LensobjInternalTo_PS1_V5 (Lensobj *in, off_t Nvalues);
+
+Lensing 	       	*Lensing_PS1_V5_R0_ToInternal (Lensing_PS1_V5_R0 *in, off_t Nvalues);
+Lensing 	       	*Lensing_PS1_V5_R1_ToInternal (Lensing_PS1_V5_R1 *in, off_t Nvalues);
+Lensing 	       	*Lensing_PS1_V5_R2_ToInternal (Lensing_PS1_V5_R2 *in, off_t Nvalues);
 
 StarPar 	       	*StarPar_PS1_V5_ToInternal (StarPar_PS1_V5 *in, off_t Nvalues);
Index: trunk/Ohana/src/libdvo/src/dvo_catalog.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_catalog.c	(revision 37994)
+++ trunk/Ohana/src/libdvo/src/dvo_catalog.c	(revision 37995)
@@ -377,4 +377,7 @@
   lensing->E1_sh_psf  = NAN;
   lensing->E2_sh_psf  = NAN;
+
+  lensing->E1_psf     = NAN;
+  lensing->E2_psf     = NAN;
 
   lensing->F_ApR5     = NAN;
Index: trunk/Ohana/src/libdvo/src/dvo_convert.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert.c	(revision 37994)
+++ trunk/Ohana/src/libdvo/src/dvo_convert.c	(revision 37995)
@@ -416,11 +416,23 @@
 
   if (!strcmp (extname, "DVO_LENSING_PS1_V5") && (ftable[0].header[0].Naxis[0] == 128)) {
-    Lensing_PS1_V5_ALT *tmpLensing;						
-    tmpLensing = gfits_table_get_Lensing_PS1_V5_ALT (ftable, Nlensing, NULL); 
+    Lensing_PS1_V5_R0 *tmpLensing;						
+    tmpLensing = gfits_table_get_Lensing_PS1_V5_R0 (ftable, Nlensing, NULL); 
     if (!tmpLensing) {							
       fprintf (stderr, "ERROR: failed to read lensings\n");		
       exit (2);								
     }									
-    lensing = Lensing_PS1_V5_ALT_ToInternal (tmpLensing, *Nlensing); 
+    lensing = Lensing_PS1_V5_R0_ToInternal (tmpLensing, *Nlensing); 
+    free (tmpLensing);							
+    *format = DVO_FORMAT_PS1_V5;					
+    return (lensing); }
+
+  if (!strcmp (extname, "DVO_LENSING_PS1_V5") && (ftable[0].header[0].Naxis[0] == 136)) {
+    Lensing_PS1_V5_R1 *tmpLensing;						
+    tmpLensing = gfits_table_get_Lensing_PS1_V5_R1 (ftable, Nlensing, NULL); 
+    if (!tmpLensing) {							
+      fprintf (stderr, "ERROR: failed to read lensings\n");		
+      exit (2);								
+    }									
+    lensing = Lensing_PS1_V5_R1_ToInternal (tmpLensing, *Nlensing); 
     free (tmpLensing);							
     *format = DVO_FORMAT_PS1_V5;					
@@ -468,5 +480,5 @@
   SKIPPING_FORMAT ("DVO_LENSING_PS1_V3",          PS1_V3,          PS1_V3);
   SKIPPING_FORMAT ("DVO_LENSING_PS1_V4",          PS1_V4,          PS1_V4);
-  CONVERT_FORMAT  ("DVO_LENSING_PS1_V5",          PS1_V5,          PS1_V5);
+  CONVERT_FORMAT  ("DVO_LENSING_PS1_V5",          PS1_V5,          PS1_V5_R2);
 # undef CONVERT_FORMAT
 
@@ -505,5 +517,5 @@
 //    FORMAT_CASE (PS1_V3,          PS1_V3);
 //    FORMAT_CASE (PS1_V4,          PS1_V4);
-      FORMAT_CASE (PS1_V5,          PS1_V5);
+      FORMAT_CASE (PS1_V5,          PS1_V5_R2);
 # undef FORMAT_CASE
 
Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c	(revision 37994)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c	(revision 37995)
@@ -444,5 +444,5 @@
 }
 
-Lensing *Lensing_PS1_V5_ToInternal (Lensing_PS1_V5 *in, off_t Nvalues) {
+Lensing *Lensing_PS1_V5_R2_ToInternal (Lensing_PS1_V5_R2 *in, off_t Nvalues) {
 
   off_t i;
@@ -477,4 +477,7 @@
     out[i].E1_sh_psf   = in[i].E1_sh_psf;
     out[i].E2_sh_psf   = in[i].E2_sh_psf;
+
+    out[i].E1_psf      = in[i].E1_psf;
+    out[i].E2_psf      = in[i].E2_psf;
 
     out[i].F_ApR5      = in[i].F_ApR5;
@@ -491,5 +494,4 @@
     out[i].objID       = in[i].objID;
     out[i].catID       = in[i].catID;
-
     out[i].averef      = in[i].averef;
 
@@ -499,8 +501,8 @@
 }
 
-Lensing_PS1_V5 *LensingInternalTo_PS1_V5 (Lensing *in, off_t Nvalues) {
-
-  off_t i;
-  Lensing_PS1_V5 *out;
+Lensing_PS1_V5_R2 *LensingInternalTo_PS1_V5_R2 (Lensing *in, off_t Nvalues) {
+
+  off_t i;
+  Lensing_PS1_V5_R2 *out;
 
   ALLOCATE_ZERO (out, Lensing_PS1_V5, Nvalues);
@@ -548,6 +550,6 @@
     out[i].objID       = in[i].objID;
     out[i].catID       = in[i].catID;
-
     out[i].averef      = in[i].averef;
+
     out[i].imageID     = in[i].imageID;
   }
@@ -583,7 +585,4 @@
     out[i].E2_sm_psf   = in[i].E2_sm_psf;     
 	             	                 
-    out[i].E1_psf      = in[i].E1_psf;
-    out[i].E2_psf      = in[i].E2_psf;     
-
     out[i].X11_sh_psf  = in[i].X11_sh_psf;
     out[i].X12_sh_psf  = in[i].X12_sh_psf;
@@ -1317,5 +1316,4 @@
     out[i].objID       = in[i].objID;
     out[i].catID       = in[i].catID;
-
     out[i].averef      = in[i].averef;
   }
@@ -1370,8 +1368,9 @@
     out[i].objID       = in[i].objID;
     out[i].catID       = in[i].catID;
-
     out[i].averef      = in[i].averef;
-  }
-  return (out);
-}
-
+
+    out[i].imageID     = in[i].imageID;
+  }
+  return (out);
+}
+