Index: trunk/Ohana/src/libautocode/def/cmf-ps1-v5-lensing-alt.d =================================================================== --- trunk/Ohana/src/libautocode/def/cmf-ps1-v5-lensing-alt.d (revision 38895) +++ trunk/Ohana/src/libautocode/def/cmf-ps1-v5-lensing-alt.d (revision 38896) @@ -57,27 +57,24 @@ FIELD M4s, MOMENTS_M4S, float, fourth moment sin(t), pixels^4 -FIELD X11_sm_obj, X11_SM_OBJ, float, lensing smear -FIELD X12_sm_obj, X12_SM_OBJ, float, lensing smear -FIELD X22_sm_obj, X22_SM_OBJ, float, lensing smear -FIELD E1_sm_obj, E1_SM_OBJ, float, lensing smear -FIELD E2_sm_obj, E2_SM_OBJ, float, lensing smear - -FIELD X11_sh_obj, X11_SH_OBJ, float, lensing shear -FIELD X12_sh_obj, X12_SH_OBJ, float, lensing shear -FIELD X22_sh_obj, X22_SH_OBJ, float, lensing shear -FIELD E1_sh_obj, E1_SH_OBJ, float, lensing shear -FIELD E2_sh_obj, E2_SH_OBJ, float, lensing shear - -FIELD X11_sm_psf, X11_SM_PSF, float, lensing smear -FIELD X12_sm_psf, X12_SM_PSF, float, lensing smear -FIELD X22_sm_psf, X22_SM_PSF, float, lensing smear -FIELD E1_sm_psf, E1_SM_PSF, float, lensing smear -FIELD E2_sm_psf, E2_SM_PSF, float, lensing smear - -FIELD X11_sh_psf, X11_SH_PSF, float, lensing shear -FIELD X12_sh_psf, X12_SH_PSF, float, lensing shear -FIELD X22_sh_psf, X22_SH_PSF, float, lensing shear -FIELD E1_sh_psf, E1_SH_PSF, float, lensing shear -FIELD E2_sh_psf, E2_SH_PSF, float, lensing shear +FIELD X11_sm_obj, LENS_X11_SM_OBJ, float, lensing smear +FIELD X12_sm_obj, LENS_X12_SM_OBJ, float, lensing smear +FIELD X22_sm_obj, LENS_X22_SM_OBJ, float, lensing smear +FIELD E1_sm_obj, LENS_E1_SM_OBJ, float, lensing smear +FIELD E2_sm_obj, LENS_E2_SM_OBJ, float, lensing smear +FIELD X11_sh_obj, LENS_X11_SH_OBJ, float, lensing shear +FIELD X12_sh_obj, LENS_X12_SH_OBJ, float, lensing shear +FIELD X22_sh_obj, LENS_X22_SH_OBJ, float, lensing shear +FIELD E1_sh_obj, LENS_E1_SH_OBJ, float, lensing shear +FIELD E2_sh_obj, LENS_E2_SH_OBJ, float, lensing shear +FIELD X11_sm_psf, LENS_X11_SM_PSF, float, lensing smear +FIELD X12_sm_psf, LENS_X12_SM_PSF, float, lensing smear +FIELD X22_sm_psf, LENS_X22_SM_PSF, float, lensing smear +FIELD E1_sm_psf, LENS_E1_SM_PSF, float, lensing smear +FIELD E2_sm_psf, LENS_E2_SM_PSF, float, lensing smear +FIELD X11_sh_psf, LENS_X11_SH_PSF, float, lensing shear +FIELD X12_sh_psf, LENS_X12_SH_PSF, float, lensing shear +FIELD X22_sh_psf, LENS_X22_SH_PSF, float, lensing shear +FIELD E1_sh_psf, LENS_E1_SH_PSF, float, lensing shear +FIELD E2_sh_psf, LENS_E2_SH_PSF, float, lensing shear FIELD Mr1, MOMENTS_R1, float, first radial moment, pixels Index: trunk/Ohana/src/libautocode/def/cmf-ps1-v5-lensing.d =================================================================== --- trunk/Ohana/src/libautocode/def/cmf-ps1-v5-lensing.d (revision 38895) +++ trunk/Ohana/src/libautocode/def/cmf-ps1-v5-lensing.d (revision 38896) @@ -57,27 +57,24 @@ FIELD M4s, MOMENTS_M4S, float, fourth moment sin(t), pixels^4 -FIELD X11_sm_obj, X11_SM_OBJ, float, lensing smear -FIELD X12_sm_obj, X12_SM_OBJ, float, lensing smear -FIELD X22_sm_obj, X22_SM_OBJ, float, lensing smear -FIELD E1_sm_obj, E1_SM_OBJ, float, lensing smear -FIELD E2_sm_obj, E2_SM_OBJ, float, lensing smear - -FIELD X11_sh_obj, X11_SH_OBJ, float, lensing shear -FIELD X12_sh_obj, X12_SH_OBJ, float, lensing shear -FIELD X22_sh_obj, X22_SH_OBJ, float, lensing shear -FIELD E1_sh_obj, E1_SH_OBJ, float, lensing shear -FIELD E2_sh_obj, E2_SH_OBJ, float, lensing shear - -FIELD X11_sm_psf, X11_SM_PSF, float, lensing smear -FIELD X12_sm_psf, X12_SM_PSF, float, lensing smear -FIELD X22_sm_psf, X22_SM_PSF, float, lensing smear -FIELD E1_sm_psf, E1_SM_PSF, float, lensing smear -FIELD E2_sm_psf, E2_SM_PSF, float, lensing smear - -FIELD X11_sh_psf, X11_SH_PSF, float, lensing shear -FIELD X12_sh_psf, X12_SH_PSF, float, lensing shear -FIELD X22_sh_psf, X22_SH_PSF, float, lensing shear -FIELD E1_sh_psf, E1_SH_PSF, float, lensing shear -FIELD E2_sh_psf, E2_SH_PSF, float, lensing shear +FIELD X11_sm_obj, LENS_X11_SM_OBJ, float, lensing smear +FIELD X12_sm_obj, LENS_X12_SM_OBJ, float, lensing smear +FIELD X22_sm_obj, LENS_X22_SM_OBJ, float, lensing smear +FIELD E1_sm_obj, LENS_E1_SM_OBJ, float, lensing smear +FIELD E2_sm_obj, LENS_E2_SM_OBJ, float, lensing smear +FIELD X11_sh_obj, LENS_X11_SH_OBJ, float, lensing shear +FIELD X12_sh_obj, LENS_X12_SH_OBJ, float, lensing shear +FIELD X22_sh_obj, LENS_X22_SH_OBJ, float, lensing shear +FIELD E1_sh_obj, LENS_E1_SH_OBJ, float, lensing shear +FIELD E2_sh_obj, LENS_E2_SH_OBJ, float, lensing shear +FIELD X11_sm_psf, LENS_X11_SM_PSF, float, lensing smear +FIELD X12_sm_psf, LENS_X12_SM_PSF, float, lensing smear +FIELD X22_sm_psf, LENS_X22_SM_PSF, float, lensing smear +FIELD E1_sm_psf, LENS_E1_SM_PSF, float, lensing smear +FIELD E2_sm_psf, LENS_E2_SM_PSF, float, lensing smear +FIELD X11_sh_psf, LENS_X11_SH_PSF, float, lensing shear +FIELD X12_sh_psf, LENS_X12_SH_PSF, float, lensing shear +FIELD X22_sh_psf, LENS_X22_SH_PSF, float, lensing shear +FIELD E1_sh_psf, LENS_E1_SH_PSF, float, lensing shear +FIELD E2_sh_psf, LENS_E2_SH_PSF, float, lensing shear FIELD srcChipNum, SRC_CHIP_NUM, short, source chip in warp