Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection (revision 37592) @@ -1,4 +1,4 @@ objID dimensionless BIGINT 8 NA ODM object identifier -unique_psps_p2_id dimensionless BIGINT 8 NA unique identifier for psps based on batch_id, OTA, and counter (per detection) +uniquePspsP2id dimensionless BIGINT 8 NA unique identifier for psps based on batch_id, OTA, and counter (per detection) detectID dimensionless BIGINT 8 NA ODM detection identifier ippObjID dimensionless BIGINT 8 NA detection id generated by IPP Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection.txt (revision 37592) @@ -1,4 +1,4 @@ objID + dvo = average.extID [calculated in addstar] -unique_psps_p2_id + ipptopsps : combination of batch_id, ota, and counter +uniquePspsP2id + ipptopsps : combination of batch_id, ota, and counter detectID + dvo = measure.extID [calculated in addstar] ippObjID + dvo = average.objID + (average.catID << 32) [NOTE: this is a change in definition] Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject (revision 37592) @@ -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 -unique_psps_do_id dimentionless BIGINT 8 NA unique id provided by ipptopsps, based on batch_Id + counter +uniquePspsDOid dimentionless BIGINT 8 NA unique id provided by ipptopsps, based on batch_Id + counter ippObjID dimensionless BIGINT 8 NA IPP object number surveyID dimensionless TINYINT 1 255 Survey ID Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject.txt (revision 37592) @@ -2,5 +2,5 @@ diffObjName = ipptopsps diffObjID = dvo / addstar -unique_psps_do_id = ipptopsps +uniquePspsDOid = ipptopsps ippObjID = dvo / addstar surveyID = ipptopsps Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection (revision 37592) @@ -1,5 +1,5 @@ diffObjID dimensionless BIGINT 8 NA diff object identifier -unique_psps_df_id dimensionless BIGINT 8 NA unique psps id (combination of batch_id, and counter) provided by ipptopsps +uniquePspsDFid dimensionless BIGINT 8 NA unique psps id (combination of batch_id, and counter) provided by ipptopsps diffDetID dimensionless BIGINT 8 NA diff detection identifier diffDetMetaID dimensionless BIGINT 8 NA diff detection meta identifier Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection.txt (revision 37592) @@ -1,5 +1,5 @@ diffObjID = dvo / addstar -unique_psps_df_id = ipptopsps +uniquePspsDFid = ipptopsps diffDetID = dvo / addstar diffDetMetaID = dvo / addstar Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier index -unique_psps_fo_id dimensionless BIGINT 8 NA unique id supplied by ipptopsps +uniquePspsFOid dimensionless BIGINT 8 NA unique id supplied by ipptopsps ippObjID dimensionless BIGINT 8 NA IPP object identifier nDetections dimensionless SMALLINT 2 -999 total number of detection measurements in all filters Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject.txt (revision 37592) @@ -1,5 +1,5 @@ objID = cpt.extID -unique_psps_fo_id = ipptopsps +uniquePspsFOid = ipptopsps ippObjID = cpt.objID | cpt.catID << 32 nDetections = sql sum of cps.NCODE (xnTotal) Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpExtended =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpExtended (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpExtended (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier -unique_psps_fw_id dimentionless BIGINT 8 NA unique id supplied by ipptopsps +uniquePspsFWid dimentionless BIGINT 8 NA unique id supplied by ipptopsps detectID dimensionless BIGINT 8 NA ODM detection identifier ippObjID dimensionless BIGINT 8 NA ippobject id generated by IPP Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpExtended.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpExtended.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpExtended.txt (revision 37592) @@ -1,5 +1,5 @@ objID = cpt.extID (???) -unique_psps_fw_id = ipptopsps +uniquePspsFWid = ipptopsps detectID = cpm.extID (???) ippObjID = cpx.obj_ID | cpx.cat_ID << 32 Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier -unique_psps_fw_id dimensionless BIGINT 8 NA unique identifier provided by ipptopsps +uniquePspsFWid dimensionless BIGINT 8 NA unique identifier provided by ipptopsps detectID dimensionless BIGINT 8 NA ODM detection identifier ippObjID dimensionless BIGINT 8 NA ippobject id generated by IPP Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement.txt (revision 37592) @@ -1,5 +1,5 @@ objID = cpt.extID (???) -unique_psps_fw_id = ipptopsps +uniquePspsFWid = ipptopsps detectID = cpm.extID (???) ippObjID = cpx.obj_id | cps.cat_id << 32 Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject (revision 37592) @@ -4,5 +4,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier index -unique_psps_ob_id dimensionless BIGINT 8 NA unique identifier provided by ipptopsps +uniquePspsOBid dimensionless BIGINT 8 NA unique identifier provided by ipptopsps 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: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject.txt (revision 37592) @@ -3,5 +3,5 @@ objID + dvo / addstar -unique_psps_ob_id = ipptopsps +uniquePspsOBid = ipptopsps gQfPerfect + dvo / relphot / secfilt.psfQfMax gMeanPSFMag + dvo / relphot / secfilt.M Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin (revision 37592) @@ -2,5 +2,5 @@ objName string VAR 8 NA IAU Name constructed from objID postion PS1.x JHHMMSS.SS+/-DDMMSS.S where x is leading number of procesing version objID dimensionless BIGINT 8 NA ODM object identifier index -unique_psps_ob_id dimensionless BIGINT 8 NA unique identifier provided by ipptopsps +uniquePspsOBid dimensionless BIGINT 8 NA unique identifier provided by ipptopsps ippObjID dimensionless BIGINT 8 NA IPP object number surveyID dimensionless TINYINT 1 255 Survey ID Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin.txt (revision 37592) @@ -2,5 +2,5 @@ objName - ipptopsps : move to dvopsps? objID + dvo:average.extID -unique_psps_ob_id = ipptopsps +uniquePspsOBid = ipptopsps ippObjID + dvo:(average.objID | average.catID << 32) surveyID + ipptopsps : internal, from survey name Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier -unique_psps_st_id dimensionless BIGINT 8 NA unique identifier provided by ipptopsps +uniquePspsSTid dimensionless BIGINT 8 NA unique identifier provided by ipptopsps ippObjID dimensionless BIGINT 8 NA ipp object identifier randomStackObjID dimensionless BIGINT 8 NA random stack id Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx.txt (revision 37592) @@ -1,5 +1,5 @@ objID + from StackObjectThin -unique_psps_st_id = ipptopsps +uniquePspsSTid = ipptopsps ippObjID + from StackObjectThin randomStackObjID + from StackObjectThin Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6 =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6 (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6 (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier -unique_psps_st_id dimensionless BIGINT 8 NA unique identifier provided by ipptopsps +uniquePspsSTid dimensionless BIGINT 8 NA unique identifier provided by ipptopsps ippObjID dimensionless BIGINT 8 NA object ID generated by IPP randomStackObjID dimensionless BIGINT 8 NA random stack id Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6.txt (revision 37592) @@ -1,5 +1,5 @@ objID + from StackObjectThin -unique_psps_st_id = ipptopsps +uniquePspsSTid = ipptopsps ippObjID + from StackObjectThin randomStackObjID + from StackObjectThin Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8 =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8 (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8 (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier -unique_psps_st_id dimensionless BIGINT 8 NA unique identifier provided by ipptopsps +uniquePspsSTid dimensionless BIGINT 8 NA unique identifier provided by ipptopsps ippObjID dimensionless BIGINT 8 NA object ID generated by IPP randomStackObjID dimensionless BIGINT 8 NA random stack id Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8.txt (revision 37592) @@ -1,5 +1,5 @@ objID + from StackObjectThin -unique_psps_st_id = ipptopsps +uniquePspsSTid = ipptopsps ippObjID + from StackObjectThin randomStackObjID + from StackObjectThin Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGUnc =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGUnc (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGUnc (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier -unique_psps_st_id dimensionless BIGINT 8 NA unique identifier provided by ipptopsps +uniquePspsSTid dimensionless BIGINT 8 NA unique identifier provided by ipptopsps ippObjID dimensionless BIGINT 8 NA object ID generated by IPP randomStackObjID dimensionless BIGINT 8 NA random stack id Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGUnc.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGUnc.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGUnc.txt (revision 37592) @@ -1,5 +1,5 @@ objID + from StackObjectThin -unique_psps_st_id = ipptopsps +uniquePspsSTid = ipptopsps ippObjID + from StackObjectThin randomStackObjID + from StackObjectThin Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitDeV =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitDeV (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitDeV (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier -unique_psps_st_id dimensionless BIGINT 8 NA unique identifier provided by ipptopsps +uniquePspsSTid dimensionless BIGINT 8 NA unique identifier provided by ipptopsps ippObjID dimensionless BIGINT 8 NA object ID generated by IPP randomStackObjID dimensionless BIGINT 8 NA random stack id Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitDeV.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitDeV.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitDeV.txt (revision 37592) @@ -1,5 +1,5 @@ objID + from StackObjectThin -unique_psps_st_id = ipptopsps +uniquePspsSTid = ipptopsps ippObjID + from StackObjectThin randomStackObjID + from StackObjectThin Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExp =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExp (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExp (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier -unique_psps_st_id dimensionless BIGINT 8 NA unique identifier provided by ipptopsps +uniquePspsSTid dimensionless BIGINT 8 NA unique identifier provided by ipptopsps ippObjID dimensionless BIGINT 8 NA object ID generated by IPP randomStackObjID dimensionless BIGINT 8 NA random stack id Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExp.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExp.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExp.txt (revision 37592) @@ -1,5 +1,5 @@ objID + from StackObjectThin -unique_psps_st_id = ipptopsps +uniquePspsSTid = ipptopsps ippObjID + from StackObjectThin randomStackObjID + from StackObjectThin Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExtra =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExtra (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExtra (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier -unique_psps_st_id dimensionless BIGINT 8 NA unique ipptopsps id +uniquePspsSTid dimensionless BIGINT 8 NA unique ipptopsps id ippObjID dimensionless BIGINT 8 NA object ID generated by IPP randomStackObjID dimensionless BIGINT 8 NA random stack id Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitSer =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitSer (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitSer (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier -unique_psps_st_id dimensionless BIGINT 8 NA unique identifier provided by ipptopsps +uniquePspsSTid dimensionless BIGINT 8 NA unique identifier provided by ipptopsps ippObjID dimensionless BIGINT 8 NA object ID generated by IPP randomStackObjID dimensionless BIGINT 8 NA random stack id Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitSer.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitSer.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitSer.txt (revision 37592) @@ -1,5 +1,5 @@ objID + from StackObjectThin -unique_psps_st_id = ipptopsps +uniquePspsSTid = ipptopsps ippObjID + from StackObjectThin randomStackObjID + from StackObjectThin Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectAttributes =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectAttributes (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectAttributes (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifie -unique_psps_st_id dimensionless BIGINT 8 NA unique identifier provided by ipptopsps +uniquePspsSTid dimensionless BIGINT 8 NA unique identifier provided by ipptopsps ippObjID dimensionless BIGINT 8 NA object ID generated by IPP randomStackObjID dimensionless BIGINT 8 NA random stack id Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectAttributes.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectAttributes.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectAttributes.txt (revision 37592) @@ -1,5 +1,5 @@ objID + from StackObjectThin -unique_psps_st_id = ipptopsps +uniquePspsSTid = ipptopsps ippObjID + from StackObjectThin randomStackObjID + from StackObjectThin Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectThin =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectThin (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectThin (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier -unique_psps_st_id dimensionless BIGINT 8 NA unique identifier provided by ipptopsps +uniquePspsSTid dimensionless BIGINT 8 NA unique identifier provided by ipptopsps ippObjID dimensionless BIGINT 8 NA object ID generated by IPP [this is a per-object, not per-filter value] surveyID dimensionless TINYINT 1 NA survey flag identifier Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectThin.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectThin.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectThin.txt (revision 37592) @@ -3,5 +3,5 @@ objID + dvo = average.extID [calculated in addstar] -unique_psps_st_id = ipptopsps +uniquePspsSTid = ipptopsps ippObjID + dvo = average.objID + (average.catID << 32) [NOTE: this is a change in definition] surveyID + ipptopsps : internal, from survey name Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackPetrosian =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackPetrosian (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackPetrosian (revision 37592) @@ -1,5 +1,5 @@ objID dimensionless BIGINT 8 NA ODM object identifier -unique_psps_st_id dimensionless BIGINT 8 NA unique identifier provided by ipptopsps +uniquePspsSTid dimensionless BIGINT 8 NA unique identifier provided by ipptopsps ippbjID dimensionless BIGINT 8 NA object ID generated by IPP randomStackObjID dimensionless BIGINT 8 NA random stack id Index: trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackPetrosian.txt =================================================================== --- trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackPetrosian.txt (revision 37586) +++ trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackPetrosian.txt (revision 37592) @@ -1,5 +1,5 @@ objID + from StackObjectThin -unique_psps_st_id = ipptopsps +uniquePspsSTid = ipptopsps ippobjID + from StackObjectThin randomStackObjID + from StackObjectThin