Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection	(revision 36845)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection	(revision 36884)
@@ -8,5 +8,5 @@
 imageID         dimensionless   BIGINT  8         NA    image id hash of frame identifier & OTA/CCD number
 randomDetID     dimensionless   BIGINT  8         NA    random detection Id
-dvoRegionID     dimensionless   REAL    4       -999    identifier to dvo spatial region
+dvoRegionID     dimensionless   INT     4          0    identifier to dvo spatial region
 obsTime         MeanJulianDays  FLOAT   8       -999    Time of mid observation in Mean Julian Days
 xPos            raw pixels      REAL    4       -999    measured x on CCD from PSF fit
@@ -40,5 +40,5 @@
 momentYY        arcsec^2        REAL    4       -999    momeny YY
 momentR1        arcsec          REAL    4       -999    first radial moment 
-momentRH        arcsec          REAL    4       -999    half light radius 
+momentRH        arcsec          REAL    4       -999    half light radius (REMOVE THIS)
 momentM3C       arcsec^n        REAL    4       -999    3rd moment sin(theta) 
 momentM3S       arcsec^n        REAL    4       -999    3rd moment cos(theta) 
@@ -51,8 +51,9 @@
 kronFluxErr     adu/seconds     REAL    4       -999    Kron flux error
 kronRad         arcsec      	REAL    4       -999    Kron radius
-kronRadErr      arcsec      	REAL    4       -999    Kron radius error
+kronRadErr      arcsec      	REAL    4       -999    Kron radius error (DROP)
 sky             adu/sec/pixel   REAL    4       -999    PSF sky level at source
 skyErr          adu/sec/pixel   REAL    4       -999    estimated error in sky
-infoFlag        dimensionless   BIGINT  8       -999    flag indicating provenance information
+infoFlag        dimensionless   INT     4       -999    flag indicating provenance information
+infoFlag2       dimensionless   INT     4       -999    flag indicating provenance information
 dataRelease     dimensionless   TINYINT 1         NA    Data release when this detection was originally taken. Recalibrations do not affect this value.
 --
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection.txt
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection.txt	(revision 36884)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection.txt	(revision 36884)
@@ -0,0 +1,58 @@
+objID           = dvo / addstar
+gcObjID		= dvo / addstar [EAM: add to addstar]
+detectID        = dvo / addstar
+ippObjID        = dvo / addstar
+ippDetectID     = dvo / addstar
+filterID        = smf / ipptopsps
+surveyID        = ipptopsps
+imageID         = smf header
+randomDetID     = ipptopsps
+dvoRegionID     = dvo / catID [EAM: add to dvopsps]
+obsTime         = smf
+xPos            = smf
+yPos            = smf
+xPosErr         = smf [EAM: modify errors to match relastro?]
+yPosErr         = smf
+pltScale        = smf
+posAngle        = smf
+----------------= 
+ra              = dvo / relastro
+dec             = dvo / relastro
+raErr           = dvo / relastro
+decErr          = dvo / relastro
+zp              = dvo / relphot
+telluricExt     = zp - zpNominal (dvopsps) [EAM: add to dvopsps]
+expTime         = smf
+airMass         = smf
+----------------= 
+psfFlux         = smf [OK: ipptopsps uses PSF_FLUX]
+psfFluxErr      = smf
+psfMajorFWHM    = smf [PSF_MAJOR is Sxx parameter, NOT FWHM] [EAM: add PSF_FWHM_MAJ to smf, keep PSF_MAJOR]
+psfMinorFWHM    = smf [PSF_MINOR is Sxx parameter, NOT FWHM] [EAM: add PSF_FWHM_MIN to smf, keep PSF_MINOR]
+psfTheta        = smf
+psfCore         = smf [EAM: add PSF_CORE to smf]
+psfQf           = smf
+psfQfPerfect    = smf
+psfChiSq        = smf
+psfLikelihood   = ipptopsps
+momentXX        = smf
+momentXY        = smf
+momentYY        = smf
+momentR1        = smf
+momentRH        = smf [XXX : MOMENTS_RH is NOT half-light radius : keep as MOMENTS_RH or calculate?]
+momentM3C       = smf
+momentM3S       = smf
+momentM4C       = smf
+momentM4S       = smf
+apFlux          = smf [requires PS1_V4]
+apFluxErr       = smf [requires PS1_V4]
+apFillF         = smf [EAM: add to pmSource and smf]
+kronFlux        = smf
+kronFluxErr     = smf
+kronRad         = (2.5*R1) : Ken : drop this or MOMENTS_R1?
+kronRadErr      = [not calculated] : drop this
+sky             = smf
+skyErr          = smf
+infoFlag        = smf
+infoFlag2       = smf
+dataRelease     = ippToPsps
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject	(revision 36845)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject	(revision 36884)
@@ -2,5 +2,5 @@
 diffObjName     string          VAR     8       NA      IAU Name constructed from objID postion PS1.x JHHMMSS.SS+/-DDMMSS.S x procesing version       
 diffObjID	dimensionless 	BIGINT 	8 	NA 	ODM object identifier index
-diffgcObjID		dimensionless	BIGINT	8	  NA 	ODM galactic coordinates identifier
+diffgcObjID	dimensionless	BIGINT	8       NA 	ODM galactic coordinates identifier
 ippObjID  	dimensionless 	BIGINT 	8 	NA 	IPP object number
 surveyID 	dimensionless 	TINYINT 1 	255 	Survey ID
@@ -10,8 +10,8 @@
 randomID 	dimensionless 	BIGINT 	8 	0 	Random integer between 0 and 2^32 = 4,394,967,296 remaining ramdom integer 0  
 batchID 	dimensionless	BIGINT 	8 	-999 	
-dvoRegionID     dimensionless  	REAL    4       -999    identifier to dvo spatial region
+dvoRegionID     dimensionless  	INT     4       -999    identifier to dvo spatial region
 objInfoFlag 	dimensionless 	BIGINT 	8 	-999 	flag indicating odd properties
 qualityFlag 	dimensionless 	TINYINT 1 	0 	subset of objInfoFlag - flags related to goodness of object
-consistencyFlag	dimensionless 	SMALLINT2 	0 	Value computed from associated detections, it is originally given by IPP and should agree with the ODM validation
+consistencyFlag	dimensionless 	SMALLINT2 	0 	Value computed from associated detections, it is originally given by IPP and should agree with the ODM validation (DROP)
 ra 		degrees 	FLOAT 	8 	NA 	Right Ascension
 dec 		degrees 	FLOAT 	8 	NA 	Declination
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject.txt
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject.txt	(revision 36884)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject.txt	(revision 36884)
@@ -0,0 +1,34 @@
+		
+diffObjName      = ipptopsps
+diffObjID	 = dvo / addstar
+diffgcObjID	 = dvo / addstar
+ippObjID  	 = dvo / addstar
+surveyID 	 = ipptopsps
+skyCellID        = smf header
+htmID 		 = PSPS
+zoneID 		 = PSPS
+randomID 	 = ipptopsps
+batchID 	 = ipptopsps
+dvoRegionID      = dvo catID 
+objInfoFlag 	 = average.flags
+qualityFlag 	 = average.flags >> 24 & 0xff (needed??)
+consistencyFlag	 = ?
+ra 		 = dvo / relastro
+dec 		 = dvo / relastro
+raErr 		 = dvo / relastro
+decErr 		 = dvo / relastro
+cx               = PSPS
+cy 	         = PSPS
+cz               = PSPS
+lambda 		 = PSPS
+beta 		 = PSPS
+l 		 = PSPS
+b 		 = PSPS
+qfPerfect 	 = dvo / relphot / secfilt. [XXX Not calculated]
+dataRelease 	 = ipptopsps
+nDetections 	 = dvo / relphot
+ng 		 = dvo / relphot
+nr 		 = dvo / relphot
+ni 		 = dvo / relphot
+nz 		 = dvo / relphot
+ny 		 = dvo / relphot
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection	(revision 36845)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection	(revision 36884)
@@ -1,4 +1,5 @@
+
 diffObjID	dimensionless 	BIGINT 	8 	NA 	diff object identifier
-diffgcObjID		dimensionless	BIGINT	8	  NA 	ODM galactic coordinates identifier
+diffgcObjID	dimensionless	BIGINT	8	NA 	ODM galactic coordinates identifier
 diffDetID 	dimensionless 	BIGINT 	8 	NA 	diff detection identifier
 diffDetMetaID 	dimensionless 	BIGINT 	8 	NA 	diff detection meta identifier
@@ -9,5 +10,5 @@
 randomDiffID 	dimensionless 	BIGINT 	8 	NA 	random diff id  
 skyCellID       dimensionless   REAL    4       -999    single float giving PrimaryCell.SkyCell identifier 
-dvoRegionID     dimensionless   REAL    4       -999    identifier to dvo spatial region
+dvoRegionID     dimensionless   INT     4          0    identifier to dvo spatial region
 obsTime 	MeanJulianDays 	FLOAT 	8 	-999 	Time of mid observation of positive detection in Mean Julian Days of positive detection
 xPos 		pixels 		REAL 	4 	-999 	measured x on diff image sky cell PSF fit
@@ -41,5 +42,5 @@
 momentYY 	arcsec^2     	REAL 	4 	-999 	momeny YY
 momentR1 	arcsec       	REAL 	4 	-999 	first radial moment 
-momentRH 	arcsec       	REAL 	4 	-999 	half light radius  
+momentRH 	arcsec       	REAL 	4 	-999 	half light radius   (DROP)
 momentM3C 	arcsec^3     	REAL 	4 	-999 	3rd moment sin(theta) 
 momentM3S 	arcsec^3     	REAL 	4 	-999 	3rd moment cos(theta) 
@@ -66,4 +67,5 @@
 sky 		adu/sec/pixel 	REAL 	4 	-999 	PSF sky level at source
 skyErr 		adu/sec/pixel 	REAL 	4 	-999 	estimated error in sky
-infoFlag 	dimensionless 	BIGINT 	8 	-999 	flag indicating provenance information
+infoFlag 	dimensionless 	INT     4 	-999 	flag indicating provenance information
+infoFlag2	dimensionless 	INT     4 	-999 	flag indicating provenance information
 dataRelease 	dimensionless 	TINYINT	1 	NA 	Data release when this detection was originally taken. Recalibrations do not affect this value.
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection.txt
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection.txt	(revision 36884)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection.txt	(revision 36884)
@@ -0,0 +1,72 @@
+		
+diffObjID	 = dvo / addstar
+diffgcObjID	 = dvo / addstar
+diffDetID 	 = dvo / addstar
+diffDetMetaID 	 = dvo / addstar
+ippDetectID 	 = dvo / addstar
+ippObjID 	 = dvo / addstar
+filterID 	 = smf / ipptopsps
+surveyID 	 = ipptopsps
+randomDiffID 	 = ipptopsps
+skyCellID        = smf header
+dvoRegionID      = dvo / catID
+obsTime 	 = smf
+xPos 		 = smf
+yPos 		 = smf
+xPosErr 	 = smf
+yPosErr 	 = smf
+pltScale         = smf
+posAngle         = smf
+---------------- = 
+ra               = dvo / relastro? [allow / require relastro recalibration?]
+dec              = dvo / relastro?
+raErr            = dvo / relastro?
+decErr           = dvo / relastro?
+zp               = dvo / relphot
+telluricExt      = (zp - zpNominal) dvopsps
+expTime          = smf
+airMass          = smf
+---------------- = 
+psfFlux 	 = smf
+psfFluxErr 	 = smf
+psfMajorFWHM     = [PSF_MAJOR is Sxx parameter, NOT FWHM] [ADD PSF_MAJ_FWHM to smf, keep PSF_MAJOR]
+psfMinorFWHM     = [PSF_MAJOR is Sxx parameter, NOT FWHM] [ditto]
+psfTheta         = smf
+psfCore          = [XXX : not currently written out!!]
+psfQf 		 = smf
+psfQfPerfect 	 = smf
+psfChiSq 	 = smf
+psfLikelihood 	 = ipptopsps
+momentXX 	 = smf
+momentXY 	 = smf
+momentYY 	 = smf
+momentR1 	 = smf
+momentRH 	 = smf [XXX : MOMENTS_RH is NOT half-light radius]
+momentM3C 	 = smf
+momentM3S 	 = smf
+momentM4C 	 = smf
+momentM4S  	 = smf
+apFlux 		 = smf [PS1_DV2 or later]
+apFluxErr 	 = smf [PS1_DV2 or later]
+apFillF          = [XXX : not currently calculated]
+kronFlux 	 = smf
+kronFluxErr 	 = smf
+kronRad 	 = (2.5*R1)
+kronRadErr 	 = [drop this? ]
+---------------- = 
+diffNPos         = smf
+diffFRatio       = smf
+diffNBad         = smf
+diffNMask        = smf
+diffNAll         = smf
+diffPdist        = smf
+diffNdist        = smf
+diffPSN          = smf
+diffNSN          = smf
+---------------- = 
+sky 		 = smf
+skyErr 		 = smf
+infoFlag 	 = smf
+infoFlag2	 = smf
+dataRelease 	 = ipptopsps
+
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject	(revision 36845)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject	(revision 36884)
@@ -1,4 +1,5 @@
+
 objID           dimensionless   BIGINT   8        NA    ODM object identifier index
-gcObjID		dimensionless	BIGINT	8	  NA 	ODM galactic coordinates identifier
+gcObjID		dimensionless	BIGINT	 8	  NA 	ODM galactic coordinates identifier
 ippObjID        dimensionless   BIGINT   8        NA    IPP object identifier
 nDetections     dimensionless   SMALLINT 2      -999    total number of detection measurements in all filters
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject.txt
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject.txt	(revision 36884)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject.txt	(revision 36884)
@@ -0,0 +1,70 @@
+		 
+objID            = dvo / addstar
+gcobjID          = dvo / addstar
+ippObjID         = dvo / addstar
+nDetections      = dvo / addstar
+batchID          = dvo / addstar
+---------------- = 
+gStackID         = 
+gnTotal          = 
+gnIncPSFMag      = 
+gnIncKronMag     = 
+gnIncApMag       = 
+gnIncR5          = 
+gnIncR6          = 
+---------------- = 
+gPSFMag          = 
+gPSFMagErr       = 
+gPSFMagStd       = 
+gKronMag         = 
+gKronMagErr      = 
+gKronMagStd      = 
+gApMag           = 
+gApMagErr        = 
+gApMagStd        = 
+---------------- = 
+gFmeanflxR5      = 
+gFmeanflxR5Err   = 
+gFmeanflxR5Std   = 
+gFmeanflxR5Fill  = 
+gFmeanflxR6      = 
+gFmeanflxR6Err   = 
+gFmeanflxR6Std   = 
+gFmeanflxR6Fill  = 
+gFlags           = 
+---------------- = 
+gLensObjSmearX11 = 
+gLensObjSmearX12 = 
+gLensObjSmearX22 = 
+gLensObjSmearE1  = 
+gLensObjSmearE2  = 
+gLensObjShearX11 = 
+gLensObjShearX12 = 
+gLensObjShearX22 = 
+gLensObjShearE1  = 
+gLensObjShearE2  = 
+gLensPSFSmearX11 = 
+gLensPSFSmearX12 = 
+gLensPSFSmearX22 = 
+gLensPSFSmearE1  = 
+gLensPSFSmearE2  = 
+gLensPSFShearX11 = 
+gLensPSFShearX12 = 
+gLensPSFShearX22 = 
+gLensPSFShearE1  = 
+gLensPSFShearE2  = 
+---------------- = 
+gGamma           = 
+gE1              = 
+gE2              = 
+
+[NOTES:
+
+ * PSF Mag, Kron Mag, Ap Mag stats are all 
+   calculated from values in the existing Measure table
+
+   XXX : no! we need to record fluxes, not mags
+
+ * R5 & R6 ap flux values & lensing parameters need
+   a new table
+
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement	(revision 36845)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement	(revision 36884)
@@ -1,4 +1,4 @@
 objID           dimensionless   BIGINT  8       NA      ODM object identifier
-gcObjID		dimensionless	BIGINT	8	  NA 	ODM galactic coordinates identifier
+gcObjID		dimensionless	BIGINT	8	NA 	ODM galactic coordinates identifier
 detectID        dimensionless   BIGINT  8       NA      ODM detection identifier
 ippObjID        dimensionless   BIGINT  8       NA      ippobject id generated by IPP
@@ -9,5 +9,5 @@
 randomWarpID    dimensionless   BIGINT  8       NA      Random warp_id
 skyCellID       dimensionless   REAL    4       -999    single float giving PrimaryCell.SkyCell identifier 
-dvoRegionID     dimensionless   REAL    4       -999    identifier to dvo spatial region
+dvoRegionID     dimensionless   INT     4       -999    identifier to dvo spatial region
 obsTime         MeanJulianDays  FLOAT   8       -999    Time of mid observation in Mean Julian Days
 ------------------------------------------------------ 
@@ -31,5 +31,5 @@
 momentYY        arcsec^2        REAL    4       -999    momeny YY
 momentR1        arcsec^1        REAL    4       -999    first radial moment 
-momentRH        arcsec          REAL    4       -999    to be half light radius  
+momentRH        arcsec          REAL    4       -999    to be half light radius   (DROP)
 momentM3C       arcsec^3        REAL    4       -999    3rd moment sin(theta) 
 momentM3S       arcsec^3        REAL    4       -999    3rd moment cos(theta) 
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement.txt
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement.txt	(revision 36884)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement.txt	(revision 36884)
@@ -0,0 +1,81 @@
+
+objID            = dvo/addstar
+gcObjID          = dvo/addstar
+detectID         = dvo/addstar
+ippObjID         = dvo/addstar
+ippDetectID      = dvo/addstar
+filterID         = 
+surveyID         = 
+forcedWarpID     = 
+randomWarpID     = 
+skyCellID        = 
+dvoRegionID      = 
+obsTime          = smf
+---------------- = 
+zp               = smf
+telluricExt      = (zp - zpNominal)
+expTime          = smf
+airMass          = smf
+---------------- = 
+psfFlux          = smf
+psfFluxErr       = smf
+psfMajorFWHM     = smf [PSF_MAJOR is Sxx parameter, NOT FWHM]
+psfMinorFWHM     = smf [PSF_MAJOR is Sxx parameter, NOT FWHM]
+psfTheta         = smf
+psfCore          = smf [XXX : not currently written out!!]
+psfQf            = smf
+psfQfPerfect     = smf
+psfChiSq         = smf
+psfLikelihood    = ipptopsps
+momentXX         = smf
+momentXY         = smf
+momentYY         = smf
+momentR1         = smf
+momentRH         = smf [XXX : MOMENTS_RH is NOT half-light radius]
+momentM3C        = smf
+momentM3S        = smf
+momentM4C        = smf
+momentM4S        = smf
+		 = 
+lensObjSmearX11  = smf [PS1_V5]
+lensObjSmearX12  = smf [PS1_V5]
+lensObjSmearX22  = smf [PS1_V5]
+lensObjSmearE1   = smf [PS1_V5]
+lensObjSmearE2   = smf [PS1_V5]
+lensObjShearX11  = smf [PS1_V5]
+lensObjShearX12  = smf [PS1_V5]
+lensObjShearX22  = smf [PS1_V5]
+lensObjShearE1   = smf [PS1_V5]
+lensObjShearE2   = smf [PS1_V5]
+lensPSFSmearX11  = smf [PS1_V5]
+lensPSFSmearX12  = smf [PS1_V5]
+lensPSFSmearX22  = smf [PS1_V5]
+lensPSFSmearE1   = smf [PS1_V5]
+lensPSFSmearE2   = smf [PS1_V5]
+lensPSFShearX11  = smf [PS1_V5]
+lensPSFShearX12  = smf [PS1_V5]
+lensPSFShearX22  = smf [PS1_V5]
+lensPSFShearE1   = smf [PS1_V5]
+lensPSFShearE2   = smf [PS1_V5]
+		 = 
+apFlux           = smf [PS1_V4]
+apFluxErr        = smf [PS1_V4]
+apFillF          = smf [EAM: add to smf output]
+kronFlux         = smf
+kronFluxErr      = smf
+kronRad          = (2.5*R1)
+kronRadErr       = [drop : not currently calculated]
+---------------- = 
+flxR5            = smf [?? calculated?]
+flxR5Err         = smf [?? calculated?]
+flxR5Std         = smf [?? calculated?]
+flxR5Fill        = smf [?? calculated?]
+flxR6            = smf [?? calculated?]
+flxR6Err         = smf [?? calculated?]
+flxR6Std         = smf [?? calculated?]
+flxR6Fill        = smf [?? calculated?]
+---------------- = 
+sky              = smf
+skyErr           = smf
+infoFlag         = 
+dataRelease      = 
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject	(revision 36845)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject	(revision 36884)
@@ -4,5 +4,5 @@
 
 objID           dimensionless   BIGINT  8       NA      ODM object identifier index
-gcObjID		dimensionless	BIGINT	8	  NA 	ODM galactic coordinates identifier
+gcObjID		dimensionless	BIGINT	8	 NA 	ODM galactic coordinates identifier
 gQfPerfect      dimensionless   REAL    4       -999    maximum psf qfPerfect from best available g band detections 
 gMeanPSFMag     AB magnitude    REAL    4       -999    mean g psf AB magnitude from best available measurements (best available as current defined by ipp "waterfall logic"  
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject.txt
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject.txt	(revision 36884)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject.txt	(revision 36884)
@@ -0,0 +1,25 @@
+
+
+
+
+objID           = dvo / addstar
+gcObjID         = dvo / addstar
+gQfPerfect      = dvo / relphot / secfilt. [XXX Not calculated]
+gMeanPSFMag     = dvo / relphot / secfilt.M 
+gMeanPSFMagErr  = dvo / relphot / secfilt.dM
+gnIncPSFMag     = dvo / relphot / secfilt.Nused [XXX : ensure .Nused matches .M]
+gMeanPSFMagStd  = dvo / relphot / secfilt.Mstdev 
+gMinPSFMag      = dvo / relphot / secfilt.Min [XXX: replace M_20, M_80 with Min, Max]
+gMaxPSFMag      = dvo / relphot / secfilt.Max [XXX: replace M_20, M_80 with Min, Max]
+		= 
+gMeanKronMag    = dvo / relphot / secfilt.Mkron 
+gMeanKronMagErr = dvo / relphot / secfilt.dMkron
+gnIncKronMag    = dvo / relphot / secfilt.nMkron [XXX : not calculated]
+gMeanKronMagStd = dvo / relphot / secfilt.MstdevKron [XXX : not calculated]
+		= 
+gMeanApMag      = dvo / relphot / secfilt.Map
+gMeanApMagErr   = dvo / relphot / secfilt.? [XXX : not calculated]
+gnIncApMag      = dvo / relphot / secfilt.? [XXX : not calculated]
+gMeanApMagStd   = dvo / relphot / secfilt.? [XXX : not calculated]
+
+gFlags          = dvo / relphot / secfilt.flags
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin	(revision 36845)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin	(revision 36884)
@@ -10,9 +10,9 @@
 randomID         dimensionless  BIGINT   8      0       Random integer between 0 and 2^32 = 4,394,967,296 remaining ramdom integer 0  
 batchID          dimensionless  BIGINT   8      -999    batch id        
-dvoRegionID      dimensionless  REAL     4      -999    identifier of dvo spatial region - dvo cat id
+dvoRegionID      dimensionless  INT      4      -999    identifier of dvo spatial region - dvo cat id
 dataRelease      dimensionless  TINYINT  1      NA      Data release Version of this table
 objInfoFlag      dimensionless  BIGINT   8      -999    flag indicating odd properties
 qualityFlag      dimensionless  TINYINT  1      0       subset of objInfoFlag - flags related to goodness of object
-consistencyFlag  dimensionless  SMALLINT 2      0       Value computed from associated detections, it is originally given by IPP and should agree with the ODM validation
+consistencyFlag  dimensionless  SMALLINT 2      0       Value computed from associated detections, it is originally given by IPP and should agree with the ODM validation (DROP)
 raStack          degrees        FLOAT    8      -999    Right Ascension - best weighted RA across filters from stack WHENEVER an object is detected in the stack  
 decStack         degrees        FLOAT    8      -999    Declination - best weighted Dec across filters from stack WHENEVER an object is detected in the stack 
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin.txt
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin.txt	(revision 36884)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin.txt	(revision 36884)
@@ -0,0 +1,49 @@
+
+objName           = ipptopsps
+objID             = dvo / addstar
+gcobjID           = dvo / addstar
+ippObjID          = dvo / addstar
+surveyID          = ipptopsps
+skyCellID         = smf header
+htmID             = PSPS
+zoneID            = PSPS
+randomID          = ipptopsps
+batchID           = ipptopsps
+dvoRegionID       = dvo / catID
+dataRelease       = ipptopsps
+objInfoFlag       = dvo / relastro,relphot [define]
+qualityFlag       = dvo / relastro,relphot [define]
+consistencyFlag   = ipptopsps?
+raStack           = dvo / allow recalibration? [ADD to average.d]
+decStack          = dvo / allow recalibration?
+raStackErr        = dvo / allow recalibration?
+decStackErr       = dvo / allow recalibration?
+raMean            = dvo / relastro
+decMean           = dvo / relastro
+raMeanErr         = dvo / relastro
+decMeanErr        = dvo / relastro
+raMeanStd         = dvo / relastro
+decMeanStd        = dvo / relastro
+----------------- = 
+--                = 
+--                = 
+--                = 
+--                = 
+--                = 
+cx                = PSPS
+cy                = PSPS
+cz                = PSPS
+lambda            = PSPS
+beta              = PSPS
+l                 = PSPS
+b                 = PSPS
+----------------- = 
+nStackObjectRows  = dvo [ADD to average.d]
+--                = 
+nStackDetections  = dvo / relphot [Sum of not-forced stack detections]
+nDetections       = dvo / relphot [Sum of ng+nr, etc?]
+ng                = dvo / relphot [Sum of GPC1.g.XY?? measure.d]
+nr                = dvo / relphot [ditto]
+ni                = dvo / relphot
+nz                = dvo / relphot
+ny                = dvo / relphot
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx	(revision 36845)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx	(revision 36884)
@@ -1,5 +1,6 @@
 
 objID            dimensionless  BIGINT  8       NA      ODM object identifier
-gcObjID		dimensionless	BIGINT	8	  NA 	ODM galactic coordinates identifier
+gcObjID	  	 dimensionless	BIGINT	8	NA 	ODM galactic coordinates identifier
+ippObjID         dimensionless  BIGINT  8       NA      ipp object identifier
 surveyID         dimensionless  TINYINT 1       0       stack type identifier
 skyCellID        dimensionless  REAL    4       -999    single float giving PrimaryCell.SkyCell identifier 
@@ -9,11 +10,10 @@
 bestDetection    dimensionless  TINYINT 1       255     identifies if this row is a best detection or not. Also set if only a primary detection exists.   
 --                                                      the Primary Dectection, 0 to 3 possible secondary dectections, and the "best" per filter.  
-dvoRegionID      dimensionless  REAL    4       -999    identifier to dvo spatial region
+dvoRegionID     dimensionless   INT    4       -999    identifier to dvo spatial region
 dataRelease     dimensionless   TINYINT 1       NA      Data release when this table was loaded.
 ------------------------------------------------------- replicate to end for each filter g,r,i,z,y
+gippDetectID    dimensionless   BIGINT  8       NA      stack identifier
 gstackDetectID  dimensionless   BIGINT  8       NA      ODM detection identifier
 gstackMetaID    dimensionless   BIGINT  8       NA      stack identifier
-gippObjID        dimensionless  BIGINT  8       NA      ipp object identifier
-gippDetectID    dimensionless   BIGINT  8       NA      stack identifier
 --------------------------------------------------------unconvolved
 gflxR3          adu/seconds     REAL    4       -999    Flux inside r = 3
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx.txt
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx.txt	(revision 36884)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx.txt	(revision 36884)
@@ -0,0 +1,56 @@
+
+objID            = dvo/addstar
+gcObjID          = dvo/addstar
+ippObjID         = dvo/addstar average.objID + (average.catID << 32)
+surveyID         = ipptopsps
+skyCellID        = smf header
+randomStackObjID = ipptopsps
+stackDetectRowID = PSPS ?
+primaryDetection = dvo
+bestDetection    = dvo
+--               = 
+dvoRegionID      = dvo / catID
+dataRelease      = ipptopsps
+---------------- = 
+gippDetectID     = dvo/addstar
+gstackDetectID   = dvopsps (see StackObject.txt)
+gstackMetaID     = dvopsps (see StackObject.txt)
+---------------- = 
+gflxR3           = smf
+gflxR3Err        = smf
+gflxR3Std        = smf
+gflxR3Fill       = smf
+gflxR4           = smf
+gflxR4Err        = smf
+gflxR4Std        = smf
+gflxR4Fill       = smf
+gflxR5           = smf
+gflxR5Err        = smf
+gflxR5Std        = smf
+gflxR5Fill       = smf
+---------------- = 
+gc1flxR3         = smf
+gc1flxR3Err      = smf
+gc1flxR3Std      = smf
+gc1flxR3Fill     = smf
+gc1flxR4         = smf
+gc1flxR4Err      = smf
+gc1flxR4Std      = smf
+gc1flxR4Fill     = smf
+gc1flxR5         = smf
+gc1flxR5Err      = smf
+gc1flxR5Std      = smf
+gc1flxR5Fill     = smf
+---------------- = 
+gc2flxR3         = smf
+gc2flxR3Err      = smf
+gc2flxR3Std      = smf
+gc2flxR3Fill     = smf
+gc2flxR4         = smf
+gc2flxR4Err      = smf
+gc2flxR4Std      = smf
+gc2flxR4Fill     = smf
+gc2flxR5         = smf
+gc2flxR5Err      = smf
+gc2flxR5Std      = smf
+gc2flxR5Fill     = smf
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFit
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFit	(revision 36845)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFit	(revision 36884)
@@ -1,5 +1,6 @@
 
 objID            dimensionless  BIGINT  8       NA      ODM object identifier
-gcObjID		dimensionless	BIGINT	8	  NA 	ODM galactic coordinates identifier
+gcObjID		 dimensionless	BIGINT	8	NA 	ODM galactic coordinates identifier
+ippObjID         dimensionless  BIGINT  8       NA      ipp object identifier
 surveyID         dimensionless  TINYINT 1       NA      survey flag identifier
 skyCellID        dimensionless  REAL    4       -999    single float giving PrimaryCell.SkyCell identifier 
@@ -9,15 +10,19 @@
 bestDetection    dimensionless  TINYINT 1       255     identifies if this row is a best detection or not. Also set if only a primary detection exists.   
 --                                                      the Primary Dectection, 0 to 3 possible secondary dectections, and the "best" per filter.  
-dvoRegionID      dimensionless  REAL    4       -999    identifier to dvo spatial region
+dvoRegionID      dimensionless  INT     4       -999    identifier to dvo spatial region
 dataRelease      dimensionless  TINYINT 1       NA      Data release when this table was loaded
 -------------------------------------------------------- replicate below for all filters (grizy)
-glogC           dimensionless   REAL    4       -999    concentration index 
-glogA           dimensionless   REAL    4       -999    asymmetry index
-gclump          dimensionless   REAL    4       -999    clumpiness factor   
+gS2             dimensionless   REAL    4       -999    (un)smoothness (Cheng 2012, Simard 2002)
+glogRT		dimensionless   REAL    4       -999    total residual (from ellipcally symmetric model)
+glogRA		dimensionless   REAL    4       -999    asymmetric residual (from ellipcally symmetric model)
+glogC           dimensionless   REAL    4       -999    concentration index  (Petrosian R_50 / R_90)
+glogA           dimensionless   REAL    4       -999    log of asymmetry index (Gyory & Bell 2010)
+gbumpy          dimensionless   REAL    4       -999    Blakeslee bumpiness
+ghalfLightRad   arcsec          REAL    4       -999    half-light radius
 -------------------------------------------------------- replicate below for all filters (grizy)
+gippDetectID    dimensionless   BIGINT  8       NA      ipp detect identifier
 gstackDetectID  dimensionless   BIGINT  8       NA      ODM detection identifier
 gstackMetaID    dimensionless   BIGINT  8       NA      stack identifier
-gippObjID       dimensionless  BIGINT  8       NA      ipp object identifier
-gippDetectID    dimensionless   BIGINT  8       NA      ipp detect identifier
+----------------------------------------------------------------------------------------
 gdeVRadius      arcsec          REAL    4       -999    deVaucouleurs radius
 gdeVRadiusErr   arcsec          REAL    4       -999    estimated error in deVaucouleurs radius
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFit.txt
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFit.txt	(revision 36884)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFit.txt	(revision 36884)
@@ -0,0 +1,200 @@
+
+objID             = dvo / addstar
+gcObjID           = dvo / addstar [EAM: add to addstar]
+ippObjID          = dvo / addstar average.objID + (average.catID << 32)
+surveyID          = ipptopsps
+skyCellID         = smf header
+randomStackObjID  = ipptopsps
+stackDetectRowID  = PSPS ?
+primaryDetection  = dvo
+bestDetection     = dvo (define?)
+--                = 
+dvoRegionID       = dvo / catID [EAM: add to dvopsps]
+dataRelease       = ipptopsps
+----------------  = 
+glogC             = [NOT currently calculated] [EAM: add to psphotStack]
+glogA             = [NOT currently calculated]
+gclump            = [NOT currently calculated]
+----------------  = 
+gippDetectID      = dvopsps (see StackObject.txt)
+gstackDetectID    = dvopsps (see StackObject.txt)
+gstackMetaID      = dvopsps (see StackObject.txt)
+----------------  = 
+gdeVRadius        = smf [NOTE: the smf has Major, Minor, Theta, but errors on Sxx, Syy, Sxy
+gdeVRadiusErr     = smf
+gdeVFlux          = smf
+gdeVFluxErr       = smf
+gdeVAb            = smf
+gdeVAbErr         = smf
+gdeVPhi           = smf
+gdeVPhiErr        = smf [convert from Sxx,Sxy,Syy??]
+graDeVOff         = smf (calculate from reported position vs psf position)
+gdecDeVOff        = smf (calculate from reported position vs psf position)
+graDeVOffErr      = smf
+gdecDeVOffErr     = smf
+gdeVCf            = [NOT currently calculated] [count nPix in fit vs pi r^2]
+gdeVLikelihood    = ipptopsps
+----------------  = 
+gexpRadius        = smf [NOTE: the smf has Major, Minor, Theta, but errors on Sxx, Syy, Sxy
+gexpRadiusErr     = smf
+gexpFlux          = smf
+gexpFluxErr       = smf
+gexpAb            = smf
+gexpAbErr         = smf
+gexpPhi           = smf
+gexpPhiErr        = smf
+graExpOff         = smf (calculate from reported position vs psf position)
+gdecExpOff        = smf (calculate from reported position vs psf position)
+graExpOffErr      = smf
+gdecExpOffErr     = smf
+gexpCf            = [NOT currently calculated]
+gexpLikelihood    = ipptopsps
+----------------  = 
+gserRadius        = smf [NOTE: the smf has Major, Minor, Theta, but errors on Sxx, Syy, Sxy
+gserRadiusErr     = smf
+gserFlux          = smf
+gserFluxErr       = smf
+gserAb            = smf
+gserAbErr         = smf
+gserNu            = smf
+gserNuErr         = smf
+gserPhi           = smf
+gserPhiErr        = smf
+graSerOff         = smf (calculate from reported position vs psf position)
+gdecSerOff        = smf (calculate from reported position vs psf position)
+graSerOffErr      = smf
+gdecSerOffErr     = smf
+gserCf            = [NOT currently calculated]
+gserLikelihood    = ipptopsps
+----------------  = 
+gpetRadius        = smf
+gpetRadiusErr     = smf
+gpetFlux          = smf
+gpetFluxErr       = smf
+gpetR50           = smf
+gpetR50Err        = smf
+gpetR90           = smf
+gpetR90Err        = smf
+gpetCf            = smf
+----------------  = 
+gflxR1            = smf
+gflxR1Err         = smf
+gflxR1Std         = smf
+gflxR1Fill        = smf
+gflxR2            = smf
+gflxR2Err         = smf
+gflxR2Std         = smf
+gflxR2Fill        = smf
+gflxR3            = smf
+gflxR3Err         = smf
+gflxR3Std         = smf
+gflxR3Fill        = smf
+gflxR4            = smf
+gflxR4Err         = smf
+gflxR4Std         = smf
+gflxR4Fill        = smf
+gflxR5            = smf
+gflxR5Err         = smf
+gflxR5Std         = smf
+gflxR5Fill        = smf
+gflxR6            = smf
+gflxR6Err         = smf
+gflxR6Std         = smf
+gflxR6Fill        = smf
+gflxR7            = smf
+gflxR7Err         = smf
+gflxR7Std         = smf
+gflxR7Fill        = smf
+gflxR8            = smf
+gflxR8Err         = smf
+gflxR8Std         = smf
+gflxR8Fill        = smf
+gflxR9            = smf
+gflxR9Err         = smf
+gflxR9Std         = smf
+gflxR9Fill        = smf
+gflxR10           = smf
+gflxR10Err        = smf
+gflxR10Std        = smf
+gflxR10Fill       = smf
+----------------  = 
+gc1flxR1          = smf
+gc1flxR1Err       = smf
+gc1flxR1Std       = smf
+gc1flxR1Fill      = smf
+gc1flxR2          = smf
+gc1flxR2Err       = smf
+gc1flxR2Std       = smf
+gc1flxR2Fill      = smf
+gc1flxR3          = smf
+gc1flxR3Err       = smf
+gc1flxR3Std       = smf
+gc1flxR3Fill      = smf
+gc1flxR4          = smf
+gc1flxR4Err       = smf
+gc1flxR4Std       = smf
+gc1flxR4Fill      = smf
+gc1flxR5          = smf
+gc1flxR5Err       = smf
+gc1flxR5Std       = smf
+gc1flxR5Fill      = smf
+gc1flxR6          = smf
+gc1flxR6Err       = smf
+gc1flxR6Std       = smf
+gc1flxR6Fill      = smf
+gc1flxR7          = smf
+gc1flxR7Err       = smf
+gc1flxR7Std       = smf
+gc1flxR7Fill      = smf
+gc1flxR8          = smf
+gc1flxR8Err       = smf
+gc1flxR8Std       = smf
+gc1flxR8Fill      = smf
+gc1flxR9          = smf
+gc1flxR9Err       = smf
+gc1flxR9Std       = smf
+gc1flxR9Fill      = smf
+gc1flxR10         = smf
+gc1flxR10Err      = smf
+gc1flxR10Std      = smf
+gc1flxR10Fill     = smf
+gc2flxR1          = smf
+gc2flxR1Err       = smf
+gc2flxR1Std       = smf
+gc2flxR1Fill      = smf
+gc2flxR2          = smf
+gc2flxR2Err       = smf
+gc2flxR2Std       = smf
+gc2flxR2Fill      = smf
+gc2flxR3          = smf
+gc2flxR3Err       = smf
+gc2flxR3Std       = smf
+gc2flxR3Fill      = smf
+gc2flxR4          = smf
+gc2flxR4Err       = smf
+gc2flxR4Std       = smf
+gc2flxR4Fill      = smf
+gc2flxR5          = smf
+gc2flxR5Err       = smf
+gc2flxR5Std       = smf
+gc2flxR5Fill      = smf
+gc2flxR6          = smf
+gc2flxR6Err       = smf
+gc2flxR6Std       = smf
+gc2flxR6Fill      = smf
+gc2flxR7          = smf
+gc2flxR7Err       = smf
+gc2flxR7Std       = smf
+gc2flxR7Fill      = smf
+gc2flxR8          = smf
+gc2flxR8Err       = smf
+gc2flxR8Std       = smf
+gc2flxR8Fill      = smf
+gc2flxR9          = smf
+gc2flxR9Err       = smf
+gc2flxR9Std       = smf
+gc2flxR9Fill      = smf
+gc2flxR10         = smf
+gc2flxR10Err      = smf
+gc2flxR10Std      = smf
+gc2flxR10Fill     = smf
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObject
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObject	(revision 36845)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObject	(revision 36884)
@@ -1,5 +1,6 @@
 
 objID             dimensionless   BIGINT  8       NA      ODM object identifier
-gcObjID		dimensionless	BIGINT	8	  NA 	ODM galactic coordinates identifier
+gcObjID	  	  dimensionless	  BIGINT  8	  NA 	  ODM galactic coordinates identifier
+ippObjID          dimensionless   BIGINT  8       NA      object ID generated by IPP
 surveyID          dimensionless   TINYINT 1       NA      survey flag identifier
 skyCellID         dimensionless   REAL    4       -999    single float giving PrimaryCell.SkyCell identifier 
@@ -9,5 +10,5 @@
 bestDetection     dimensionless   TINYINT 1       255     identifies if this row is a best detection or not. Also set if only a primary detection exists.   
                                                           the Primary Dectection, 0 to 3 possible secondary dectections, and the "best" per filter.  
-dvoRegionID       dimensionless   REAL    4       -999    identifier to dvo spatial region
+dvoRegionID       dimensionless   INT     4       -999    identifier to dvo spatial region
 dataRelease       dimensionless   TINYINT 1       NA      Data release when this detection was originally taken.
 ------------------------------------------------------------------------------------------
@@ -15,8 +16,8 @@
 -- Replicate the section below for each filter, changing the prefex ("g" in this example) 
 ------------------------------------------------------------------------------------------
-gippObjID         dimensionless   BIGINT  8       NA      object ID generated by IPP
 gippDetectID      dimensionless   BIGINT  8       NA      detection ID generated by IPP
 gstackDetectID    dimensionless   BIGINT  8       NA      ODM detection identifier
 gstackMetaID      dimensionless   BIGINT  8       NA      stack identifier
+------------------------------------------------------------------------------------------
 gxPos             arcsec          REAL    4       -999    measured x in sky Cell from PSF fit
 gyPos             arcsec          REAL    4       -999    measured y in sky Cell from PSF fit
@@ -41,5 +42,5 @@
 gmomentYY         arcsec^2        REAL    4       -999    moment YY
 gmomentR1         arcsec          REAL    4       -999    moment R1
-gmomentRH         arcsec          REAL    4       -999    moment RH - or half light radius
+gmomentRH         arcsec          REAL    4       -999    moment RH - or half light radius (REMOVE)
 gPSFFlux     	  adu/sec         REAL    4       -999    g psf flux from stack
 gPSFFluxErr  	  adu/sec         REAL    4       -999    estimated error of g psf flux from stack
@@ -58,5 +59,6 @@
 gsky              adu/secs/arcsec REAL    4       -999    PSF sky level at source (adu)
 gskyErr           adu/secs/arcsec REAL    4       -999    estimated error in sky
-ginfoFlag         dimensionless   BIGINT  8       -999    indicator of strange propeties
+ginfoFlag         dimensionless   INT     4       -999    indicator of strange propeties
+ginfoFlag2        dimensionless   INT     4       -999    indicator of strange propeties
 gnFrames          dimensionless   INT     4       -999    Number of frames contributing to source
 
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObject.txt
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObject.txt	(revision 36884)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObject.txt	(revision 36884)
@@ -0,0 +1,66 @@
+		  
+objID              = dvo/addstar = average.extID
+gcObjID            = dvo/addstar [EAM: add to addstar, average.d]
+ippObjID           = dvo/addstar = average.objID + (average.catID << 32)
+surveyID           = ipptopsps
+skyCellID          = ipptopsps / smf header
+randomStackObjID   = ipptopsps
+stackDetectRowID   = PSPS ?
+primaryDetection   = dvo 
+bestDetection      = dvo ?
+                   = 
+dvoRegionID        = dvo / catID
+dataRelease        = ippToPsps
+------------------ = 
+-- attributes for  = 
+-- Replicate the s = 
+------------------ = 
+gippDetectID       = dvopsps.ippDetectID = dvo.measure.detID = smf / IPP_IDET
+gstackDetectID     = dvopsps.detectID = dvo:measure.extID (addstar psps stack detect ID)
+gstackMetaID       = smf header 
+------------------ = 
+gxPos              = smf
+gyPos              = smf
+gxPosErr           = smf
+gyPosErr           = smf
+gra                = smf or relastro? (Ken?)
+gdec               = smf or relastro?
+graErr             = smf or relastro?
+gdecErr            = smf or relastro?
+gzp                = dvo / relphot
+gexpTime           = smf [see Detection.txt]
+gpsfMajorFWHM      = smf [see Detection.txt]
+gpsfMinorFWHM      = smf [see Detection.txt]
+gpsfTheta          = smf [see Detection.txt]
+gpsfCore           = smf [see Detection.txt]
+gpsfLikelihood     = ipptopsps
+gpsfQf             = smf
+gpsfQfPerfect      = smf
+gpsfChiSq          = smf
+gmomentXX          = smf
+gmomentXY          = smf
+gmomentYY          = smf
+gmomentR1          = smf
+gmomentRH          = smf [XXX : MOMENTS_RH is NOT half-light radius]
+gPSFFlux     	   = smf
+gPSFFluxErr  	   = smf
+gApFlux            = smf
+gApFluxErr         = smf
+gApFillFac         = smf [EAM: add to smf output]
+gKronFlux          = smf
+gKronFluxErr       = smf
+gKronRad           = (2.5 * R1) [drop from schema]
+gPSFMag      	   = smf
+gPSFMagErr   	   = smf
+gApMag       	   = smf
+gApMagErr    	   = smf
+gKronMag     	   = smf (calculated)
+gKronMagErr  	   = smf (calculated)
+gsky               = smf
+gskyErr            = smf
+ginfoFlag          = smf
+ginfoFlag2         = smf
+gnFrames           = smf
+
+[NOTE: for stacks, dvo only needs to determine the 
+       primary measurement (and modified zero point?).
Index: branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/changes.r36847
===================================================================
--- branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/changes.r36847	(revision 36884)
+++ branches/eam_branches/ipp-20140610/ippToPsps/pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/changes.r36847	(revision 36884)
@@ -0,0 +1,199 @@
+Index: Detection
+===================================================================
+--- Detection	(revision 36838)
++++ Detection	(working copy)
+@@ -7,7 +7,7 @@
+ surveyID        dimensionless   TINYINT 1         NA    survey flag identifier
+ imageID         dimensionless   BIGINT  8         NA    image id hash of frame identifier & OTA/CCD number
+ randomDetID     dimensionless   BIGINT  8         NA    random detection Id
+-dvoRegionID     dimensionless   REAL    4       -999    identifier to dvo spatial region
++dvoRegionID     dimensionless   INT     4          0    identifier to dvo spatial region
+ obsTime         MeanJulianDays  FLOAT   8       -999    Time of mid observation in Mean Julian Days
+ xPos            raw pixels      REAL    4       -999    measured x on CCD from PSF fit
+ yPos            raw pixels      REAL    4       -999    measured y on CCD from PSF fit
+@@ -53,7 +53,8 @@
+ kronRadErr      arcsec      	REAL    4       -999    Kron radius error
+ sky             adu/sec/pixel   REAL    4       -999    PSF sky level at source
+ skyErr          adu/sec/pixel   REAL    4       -999    estimated error in sky
+-infoFlag        dimensionless   BIGINT  8       -999    flag indicating provenance information
++infoFlag        dimensionless   INT     4       -999    flag indicating provenance information
++infoFlag2       dimensionless   INT     4       -999    flag indicating provenance information
+ dataRelease     dimensionless   TINYINT 1         NA    Data release when this detection was originally taken. Recalibrations do not affect this value.
+ --
+ -- [231 bytes/det]
+Index: StackApFlx
+===================================================================
+--- StackApFlx	(revision 36838)
++++ StackApFlx	(working copy)
+@@ -1,6 +1,7 @@
+ 
+ objID            dimensionless  BIGINT  8       NA      ODM object identifier
+ gcObjID		dimensionless	BIGINT	8	  NA 	ODM galactic coordinates identifier
++ippObjID         dimensionless  BIGINT  8       NA      ipp object identifier
+ surveyID         dimensionless  TINYINT 1       0       stack type identifier
+ skyCellID        dimensionless  REAL    4       -999    single float giving PrimaryCell.SkyCell identifier 
+ randomStackObjID dimensionless  BIGINT  8       NA      random stack id
+@@ -8,13 +9,12 @@
+ primaryDetection dimensionless  TINYINT 1       255     identifies if this row is a primary stack detection. True about 80% of time. 
+ bestDetection    dimensionless  TINYINT 1       255     identifies if this row is a best detection or not. Also set if only a primary detection exists.   
+ --                                                      the Primary Dectection, 0 to 3 possible secondary dectections, and the "best" per filter.  
+-dvoRegionID      dimensionless  REAL    4       -999    identifier to dvo spatial region
++dvoRegionID     dimensionless   INT    4       -999    identifier to dvo spatial region
+ dataRelease     dimensionless   TINYINT 1       NA      Data release when this table was loaded.
+ ------------------------------------------------------- replicate to end for each filter g,r,i,z,y
++gippDetectID    dimensionless   BIGINT  8       NA      stack identifier
+ gstackDetectID  dimensionless   BIGINT  8       NA      ODM detection identifier
+ gstackMetaID    dimensionless   BIGINT  8       NA      stack identifier
+-gippObjID        dimensionless  BIGINT  8       NA      ipp object identifier
+-gippDetectID    dimensionless   BIGINT  8       NA      stack identifier
+ --------------------------------------------------------unconvolved
+ gflxR3          adu/seconds     REAL    4       -999    Flux inside r = 3
+ gflxR3Err       adu/seconds     REAL    4       -999    estimated error is flxR3
+Index: ForcedWarpMeasurement
+===================================================================
+--- ForcedWarpMeasurement	(revision 36838)
++++ ForcedWarpMeasurement	(working copy)
+@@ -8,7 +8,7 @@
+ forcedWarpID    dimensionless   BIGINT  8       NA      IPP warp_id
+ randomWarpID    dimensionless   BIGINT  8       NA      Random warp_id
+ skyCellID       dimensionless   REAL    4       -999    single float giving PrimaryCell.SkyCell identifier 
+-dvoRegionID     dimensionless   REAL    4       -999    identifier to dvo spatial region
++dvoRegionID     dimensionless   INT     4       -999    identifier to dvo spatial region
+ obsTime         MeanJulianDays  FLOAT   8       -999    Time of mid observation in Mean Julian Days
+ ------------------------------------------------------ 
+ zp              magnitude       REAL    4       0       zeropoint (only thing needed to convert adu/sec to AB mag), note no zpErr
+Index: DiffDetection
+===================================================================
+--- DiffDetection	(revision 36838)
++++ DiffDetection	(working copy)
+@@ -1,3 +1,4 @@
++
+ diffObjID	dimensionless 	BIGINT 	8 	NA 	diff object identifier
+ diffgcObjID		dimensionless	BIGINT	8	  NA 	ODM galactic coordinates identifier
+ diffDetID 	dimensionless 	BIGINT 	8 	NA 	diff detection identifier
+@@ -8,7 +9,7 @@
+ surveyID 	dimensionless 	TINYINT	1 	NA 	survey flag identifierr
+ randomDiffID 	dimensionless 	BIGINT 	8 	NA 	random diff id  
+ skyCellID       dimensionless   REAL    4       -999    single float giving PrimaryCell.SkyCell identifier 
+-dvoRegionID     dimensionless   REAL    4       -999    identifier to dvo spatial region
++dvoRegionID     dimensionless   INT     4          0    identifier to dvo spatial region
+ obsTime 	MeanJulianDays 	FLOAT 	8 	-999 	Time of mid observation of positive detection in Mean Julian Days of positive detection
+ xPos 		pixels 		REAL 	4 	-999 	measured x on diff image sky cell PSF fit
+ yPos 		pixels 		REAL 	4 	-999 	measured y on diff image sky cell from PSF fit
+@@ -65,5 +66,6 @@
+ -------------------------------------------------------
+ sky 		adu/sec/pixel 	REAL 	4 	-999 	PSF sky level at source
+ skyErr 		adu/sec/pixel 	REAL 	4 	-999 	estimated error in sky
+-infoFlag 	dimensionless 	BIGINT 	8 	-999 	flag indicating provenance information
++infoFlag 	dimensionless 	INT     4 	-999 	flag indicating provenance information
++infoFlag2	dimensionless 	INT     4 	-999 	flag indicating provenance information
+ dataRelease 	dimensionless 	TINYINT	1 	NA 	Data release when this detection was originally taken. Recalibrations do not affect this value.
+Index: ObjectThin
+===================================================================
+--- ObjectThin	(revision 36838)
++++ ObjectThin	(working copy)
+@@ -9,7 +9,7 @@
+ zoneID           dimensionless  INT      4      NA      Zone index
+ randomID         dimensionless  BIGINT   8      0       Random integer between 0 and 2^32 = 4,394,967,296 remaining ramdom integer 0  
+ batchID          dimensionless  BIGINT   8      -999    batch id        
+-dvoRegionID      dimensionless  REAL     4      -999    identifier of dvo spatial region - dvo cat id
++dvoRegionID      dimensionless  INT      4      -999    identifier of dvo spatial region - dvo cat id
+ dataRelease      dimensionless  TINYINT  1      NA      Data release Version of this table
+ objInfoFlag      dimensionless  BIGINT   8      -999    flag indicating odd properties
+ qualityFlag      dimensionless  TINYINT  1      0       subset of objInfoFlag - flags related to goodness of object
+Index: StackModelFit
+===================================================================
+--- StackModelFit	(revision 36838)
++++ StackModelFit	(working copy)
+@@ -1,6 +1,7 @@
+ 
+ objID            dimensionless  BIGINT  8       NA      ODM object identifier
+ gcObjID		dimensionless	BIGINT	8	  NA 	ODM galactic coordinates identifier
++ippObjID         dimensionless  BIGINT  8       NA      ipp object identifier
+ surveyID         dimensionless  TINYINT 1       NA      survey flag identifier
+ skyCellID        dimensionless  REAL    4       -999    single float giving PrimaryCell.SkyCell identifier 
+ randomStackObjID dimensionless  BIGINT  8       NA      random stack id
+@@ -8,17 +9,17 @@
+ primaryDetection dimensionless  TINYINT 1       255     identifies if this row is a primary stack detection. True about 80% of time. 
+ bestDetection    dimensionless  TINYINT 1       255     identifies if this row is a best detection or not. Also set if only a primary detection exists.   
+ --                                                      the Primary Dectection, 0 to 3 possible secondary dectections, and the "best" per filter.  
+-dvoRegionID      dimensionless  REAL    4       -999    identifier to dvo spatial region
++dvoRegionID      dimensionless  INT     4       -999    identifier to dvo spatial region
+ dataRelease      dimensionless  TINYINT 1       NA      Data release when this table was loaded
+ -------------------------------------------------------- replicate below for all filters (grizy)
+ glogC           dimensionless   REAL    4       -999    concentration index 
+ glogA           dimensionless   REAL    4       -999    asymmetry index
+ gclump          dimensionless   REAL    4       -999    clumpiness factor   
+ -------------------------------------------------------- replicate below for all filters (grizy)
++gippDetectID    dimensionless   BIGINT  8       NA      ipp detect identifier
+ gstackDetectID  dimensionless   BIGINT  8       NA      ODM detection identifier
+ gstackMetaID    dimensionless   BIGINT  8       NA      stack identifier
+-gippObjID       dimensionless  BIGINT  8       NA      ipp object identifier
+-gippDetectID    dimensionless   BIGINT  8       NA      ipp detect identifier
++----------------------------------------------------------------------------------------
+ gdeVRadius      arcsec          REAL    4       -999    deVaucouleurs radius
+ gdeVRadiusErr   arcsec          REAL    4       -999    estimated error in deVaucouleurs radius
+ gdeVFlux        adu/seconds     REAL    4       -999    deVaucouleurs flux
+Index: ForcedMeanObject
+===================================================================
+--- ForcedMeanObject	(revision 36838)
++++ ForcedMeanObject	(working copy)
+@@ -1,3 +1,4 @@
++
+ objID           dimensionless   BIGINT   8        NA    ODM object identifier index
+ gcObjID		dimensionless	BIGINT	8	  NA 	ODM galactic coordinates identifier
+ ippObjID        dimensionless   BIGINT   8        NA    IPP object identifier
+Index: DiffDetObject
+===================================================================
+--- DiffDetObject	(revision 36838)
++++ DiffDetObject	(working copy)
+@@ -9,7 +9,7 @@
+ zoneID 		dimensionless 	INT 	4 	NA 	Zone index
+ randomID 	dimensionless 	BIGINT 	8 	0 	Random integer between 0 and 2^32 = 4,394,967,296 remaining ramdom integer 0  
+ batchID 	dimensionless	BIGINT 	8 	-999 	
+-dvoRegionID     dimensionless  	REAL    4       -999    identifier to dvo spatial region
++dvoRegionID     dimensionless  	INT     4       -999    identifier to dvo spatial region
+ objInfoFlag 	dimensionless 	BIGINT 	8 	-999 	flag indicating odd properties
+ qualityFlag 	dimensionless 	TINYINT 1 	0 	subset of objInfoFlag - flags related to goodness of object
+ consistencyFlag	dimensionless 	SMALLINT2 	0 	Value computed from associated detections, it is originally given by IPP and should agree with the ODM validation
+Index: StackObject
+===================================================================
+--- StackObject	(revision 36838)
++++ StackObject	(working copy)
+@@ -1,6 +1,7 @@
+ 
+ objID             dimensionless   BIGINT  8       NA      ODM object identifier
+ gcObjID		dimensionless	BIGINT	8	  NA 	ODM galactic coordinates identifier
++ippObjID          dimensionless   BIGINT  8       NA      object ID generated by IPP
+ surveyID          dimensionless   TINYINT 1       NA      survey flag identifier
+ skyCellID         dimensionless   REAL    4       -999    single float giving PrimaryCell.SkyCell identifier 
+ randomStackObjID  dimensionless   BIGINT  8       NA      random stack id
+@@ -8,16 +9,16 @@
+ primaryDetection  dimensionless   TINYINT 1       255     identifies if this row is a primary stack detection. True about 80% of time. 
+ bestDetection     dimensionless   TINYINT 1       255     identifies if this row is a best detection or not. Also set if only a primary detection exists.   
+                                                           the Primary Dectection, 0 to 3 possible secondary dectections, and the "best" per filter.  
+-dvoRegionID       dimensionless   REAL    4       -999    identifier to dvo spatial region
++dvoRegionID       dimensionless   INT     4       -999    identifier to dvo spatial region
+ dataRelease       dimensionless   TINYINT 1       NA      Data release when this detection was originally taken.
+ ------------------------------------------------------------------------------------------
+ -- attributes for all stack detections in all filters (these are currently forced anyway) 
+ -- Replicate the section below for each filter, changing the prefex ("g" in this example) 
+ ------------------------------------------------------------------------------------------
+-gippObjID         dimensionless   BIGINT  8       NA      object ID generated by IPP
+ gippDetectID      dimensionless   BIGINT  8       NA      detection ID generated by IPP
+ gstackDetectID    dimensionless   BIGINT  8       NA      ODM detection identifier
+ gstackMetaID      dimensionless   BIGINT  8       NA      stack identifier
++------------------------------------------------------------------------------------------
+ gxPos             arcsec          REAL    4       -999    measured x in sky Cell from PSF fit
+ gyPos             arcsec          REAL    4       -999    measured y in sky Cell from PSF fit
+ gxPosErr          arcsec          REAL    4       -999    estimated error in x
+@@ -57,7 +58,8 @@
+ gKronMagErr  	  AB magnitude    REAL    4       -999    estimated error of g kron AB magnitude from stack
+ gsky              adu/secs/arcsec REAL    4       -999    PSF sky level at source (adu)
+ gskyErr           adu/secs/arcsec REAL    4       -999    estimated error in sky
+-ginfoFlag         dimensionless   BIGINT  8       -999    indicator of strange propeties
++ginfoFlag         dimensionless   INT     4       -999    indicator of strange propeties
++ginfoFlag2        dimensionless   INT     4       -999    indicator of strange propeties
+ gnFrames          dimensionless   INT     4       -999    Number of frames contributing to source
+ 
+ -- [220 byte/filter/obj + 44 byte/obj]
