Index: /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection.txt
===================================================================
--- /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection.txt	(revision 37215)
+++ /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection.txt	(revision 37216)
@@ -7,5 +7,5 @@
 imageID         - ipptopsps : expID x y (*** is this right???) (smf:IMAGEID / gpc1.chipRun.chip_image_id)_
 randomDetID     + ipptopsps : RANDOM from sql
-dvoRegionID     - dvo / catID [EAM: add to dvopsps]
+dvoRegionID     - dvo:average.catID
 obsTime         - smf:MJD-OBS + 0.5 EXPTIME / 84600
 xPos            + smf:X_PSF 
Index: /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject.txt
===================================================================
--- /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject.txt	(revision 37215)
+++ /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject.txt	(revision 37216)
@@ -1,25 +1,23 @@
 
+*** I've checked that these are plausible, not exact
 
+objID           + dvo / addstar
+gQfPerfect      - dvo / relphot / secfilt. [XXX Not calculated]
+gMeanPSFMag     + dvo / relphot / secfilt.M 
+gMeanPSFMagErr  + dvo / relphot / secfilt.dM
+gMeanPSFMagNpt  + dvo / relphot / secfilt.Nused [XXX : ensure .Nused matches .M]
+gMeanPSFMagStd  + dvo / relphot / secfilt.Mstdev 
+gMeanPSFMagMin  + dvo / relphot / secfilt.Min [XXX: replace M_20, M_80 with Min, Max]
+gMeanPSFMagMax  + dvo / relphot / secfilt.Max [XXX: replace M_20, M_80 with Min, Max]
 
+gMeanKronMag    + dvo / relphot / secfilt.Mkron 
+gMeanKronMagErr + dvo / relphot / secfilt.dMkron
+gMeanKronMagNpt + dvo / relphot / secfilt.nMkron [XXX : not calculated]
+gMeanKronMagStd - dvo / relphot / secfilt.MstdevKron [XXX : not calculated]
 
-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]
+gMeanApMag      + dvo / relphot / secfilt.Map
+gMeanApMagErr   + dvo / relphot / secfilt.? [XXX : not calculated]
+gMeanApMagNpt   + dvo / relphot / secfilt.? [XXX : not calculated]
+gMeanApMagStd   + dvo / relphot / secfilt.? [XXX : not calculated]
 
-gFlags          = dvo / relphot / secfilt.flags
+gFlags          + dvo / relphot / secfilt.flags
Index: /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin.txt
===================================================================
--- /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin.txt	(revision 37215)
+++ /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin.txt	(revision 37216)
@@ -1,49 +1,46 @@
 
-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 [XXX does not exist: chisq values instead?]
-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
+objName           - ipptopsps : move to dvopsps?
+objID             + dvo:average.extID
+ippObjID          + dvo:(average.objID | average.catID << 32)
+surveyID          + ipptopsps : internal, from survey name
+htmID             - PSPS
+zoneID            - PSPS
+randomID          + ipptopsps : RANDOM from sql
+batchID           + ipptopsps : internal
+dvoRegionID       ? dvo:average.catID
+dataRelease       + ipptopsps : user input (skychunk.dataRelease)
+objInfoFlag       + dvo:average.flags
+qualityFlag       - (dvo:average.flags >> 24) & 0xFF *** correct??
+consistencyFlag   - *** hard-wired in ipptopsps to 0
+raStack           - dvo:average.Rstk *** not calculated?
+decStack          - dvo:average.Dstk *** not calculated?
+raStackErr        - dvo:average.dRstk *** not calculated?
+decStackErr       - dvo:average.dDstk *** not calculated?
+raMean            + dvo:average.R
+decMean           + dvo:average.D
+raMeanErr         - dvo:average.dR
+decMeanErr        - dvo:average.dD
+posMeanChisq      - dvo:average.ChiSqAve
+-----------------   
+--                  
+--                  
+--                  
+--                  
+--                  
+cx                - PSPS
+cy                - PSPS
+cz                - PSPS
+lambda            - PSPS
+beta              - PSPS
+l                 - PSPS
+b                 - PSPS
+----------------- 
+nStackObjectRows  - *** set to 0 ***
+--                
+nStackDetections  - not set?
+nDetections       - ipptopsps:Sum of ng+nr in sql
+ng                - dvo:secfilt.ncode ** check that this is right
+nr                - dvo:secfilt.ncode ** check that this is right
+ni                - dvo:secfilt.ncode ** check that this is right
+nz                - dvo:secfilt.ncode ** check that this is right
+ny                - dvo:secfilt.ncode ** check that this is right
