Index: trunk/ippToPsps/config/tables.DF.vot =================================================================== --- trunk/ippToPsps/config/tables.DF.vot (revision 37586) +++ trunk/ippToPsps/config/tables.DF.vot (revision 37592) @@ -94,4 +94,7 @@ ODM diff object identifier + + unique psps diff detection id, based on batch + row number + ODM diff detection identifier Index: trunk/ippToPsps/config/tables.DO.vot =================================================================== --- trunk/ippToPsps/config/tables.DO.vot (revision 37586) +++ trunk/ippToPsps/config/tables.DO.vot (revision 37592) @@ -11,4 +11,7 @@ ODM object identifier index + + + unique psps diff object id based on batch id and row number Index: trunk/ippToPsps/config/tables.FO.vot =================================================================== --- trunk/ippToPsps/config/tables.FO.vot (revision 37586) +++ trunk/ippToPsps/config/tables.FO.vot (revision 37592) @@ -9,5 +9,5 @@ ODM object identifier index - + unique psps id Index: trunk/ippToPsps/config/tables.FW.vot =================================================================== --- trunk/ippToPsps/config/tables.FW.vot (revision 37586) +++ trunk/ippToPsps/config/tables.FW.vot (revision 37592) @@ -115,5 +115,5 @@ ODM object identifier - + unique psps id Index: trunk/ippToPsps/config/tables.OB.vot =================================================================== --- trunk/ippToPsps/config/tables.OB.vot (revision 37586) +++ trunk/ippToPsps/config/tables.OB.vot (revision 37592) @@ -12,5 +12,5 @@ ODM object identifier index - + unique psps id @@ -139,5 +139,5 @@ ODM object identifier index - + unique psps id Index: trunk/ippToPsps/config/tables.P2.vot =================================================================== --- trunk/ippToPsps/config/tables.P2.vot (revision 37586) +++ trunk/ippToPsps/config/tables.P2.vot (revision 37592) @@ -383,5 +383,5 @@ ODM object identifier - + unique psps id Index: trunk/ippToPsps/config/tables.ST.vot =================================================================== --- trunk/ippToPsps/config/tables.ST.vot (revision 37586) +++ trunk/ippToPsps/config/tables.ST.vot (revision 37592) @@ -131,5 +131,5 @@ ODM object identifier - + unique psps id @@ -474,5 +474,5 @@ ODM object identifier - + unique psps id @@ -1010,5 +1010,5 @@ ODM object identifier - + unique psps id @@ -1635,5 +1635,5 @@ ODM object identifier - + unique psps id @@ -1826,5 +1826,5 @@ ODM object identifier - + unique psps id @@ -2122,5 +2122,5 @@ ODM object identifier - + unique psps id @@ -2418,5 +2418,5 @@ ODM object identifier - + unique psps id @@ -2744,5 +2744,5 @@ ODM object identifier - + unique psps id @@ -3430,5 +3430,5 @@ ODM object identifier - + unique psps id @@ -4116,5 +4116,5 @@ ODM object identifier - + unique psps id @@ -4802,5 +4802,5 @@ ODM object identifier - + unique psps id Index: trunk/ippToPsps/jython/detectionbatch.py =================================================================== --- trunk/ippToPsps/jython/detectionbatch.py (revision 37586) +++ trunk/ippToPsps/jython/detectionbatch.py (revision 37592) @@ -607,4 +607,17 @@ ''' + Updates table and generates pspsuniqueids + ''' + + def updatePspsUniqueIDs(self,table): + sql = "UPDATE "+table+" join (select @r:=@r+1 rownum, objID from \ + (select @r:=0) r, "+table+" t) as foo using (objID) set \ + uniquePspsP2id = ((" +str(self.batchID)+ "*1000000000 ) + rownum)" + try: self.scratchDb.execute(sql) + except: + self.logger.errorPair('failed sql',sql) + return + + ''' Does the processing, i.e. pulling stuff from IPP tables into PSPS tables ''' @@ -637,4 +650,6 @@ results['NULLOBJID'] = self.scratchDb.reportAndDeleteRowsWithNULLS("Detection_" + chipname, "objID") #self.logger.info("deleted nulls") + self.logger.info("add psps unique p2 ids") + self.updatePspsUniqueIDs("Detection_" + chipname, self.imageIDs[chipname]) self.updateImageID("Detection_" + chipname, x, y) #self.logger.info("updateImageId") Index: trunk/ippToPsps/jython/forcedwarpbatch.py =================================================================== --- trunk/ippToPsps/jython/forcedwarpbatch.py (revision 37586) +++ trunk/ippToPsps/jython/forcedwarpbatch.py (revision 37592) @@ -224,4 +224,6 @@ self.generateRandomIDs() + self.generateUniquePspsIDs() + # add indexes ForcedWarpMeasurement self.scratchDb.createIndex("ForcedWarpMeasurement", "objID") @@ -249,4 +251,6 @@ self.tablesToExport.append("ForcedWarpExtended") + # get dvo ids, + # add in the psps unique ids from stuff ''' @@ -326,5 +330,5 @@ def generateRandomIDs(self): - sql = "UPDATE ForcedWarpMeasurement set randomWarpID = FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)"; + sql = "UPDATE ForcedWarpMeasurement set randomWarpID = FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)" try: self.scratchDb.execute(sql) except: @@ -333,5 +337,17 @@ - + ''' + Updates table and generates pspsuniqueids + ''' + + def generatePspsUniqueIDs(self): + sql = "UPDATE ForcedWarpMeasurement join (select @r:=@r+1 rownum, objID from \ + (select @r:=0) r, ForcedWarpMeasurement t) as foo using (objID) set \ + uniquePspsFWid = ((" +str(self.batchID)+ "*1000000000 ) + rownum)" + try: self.scratchDb.execute(sql) + except: + self.logger.errorPair('failed sql',sql) + return + Index: trunk/ippToPsps/jython/objectbatch.py =================================================================== --- trunk/ippToPsps/jython/objectbatch.py (revision 37586) +++ trunk/ippToPsps/jython/objectbatch.py (revision 37592) @@ -87,4 +87,19 @@ return True + ''' + Updates table and generates pspsuniqueids + ''' + + def updatePspsUniqueIDs(self): + sql = "UPDATE ObjectThin join (select @r:=@r+1 rownum, objID from \ + (select @r:=0) r, ObjectThin t) as foo using (objID) set \ + uniquePspsP2id = ((" +str(self.batchID) "*1000000000 ) + rownum)"; + try: self.scratchDb.execute(sql) + except: + self.logger.errorPair('failed sql',sql) + return + + + ''' Applies indexes to the IPP tables @@ -429,4 +444,6 @@ ##self.dvoObjects.purgeRegion(self.region) + self.updatePspsUniqueIDs() + self.setMinMaxObjID(["ObjectThin"]) @@ -439,7 +456,7 @@ cptTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cpt") cpsTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cps") - self.logger.infoPair("Populating MeanObject from ", "ObjectThin") - - sql = "INSERT INTO MeanObject ( objID ) SELECT objID FROM ObjectThin" + self.logger.infoPair("Populating MeanObject.objid and pspsUniqueOBid from ", "ObjectThin") + + sql = "INSERT INTO MeanObject ( objID, pspsUniqueOBid ) SELECT objID, pspsUniqueOBid FROM ObjectThin" try: self.scratchDb.execute(sql) @@ -450,5 +467,8 @@ self.logger.infoPair("Adding 'row' columns to", "MeanObject table") self.scratchDb.addRowCountColumn("MeanObject", "row") - + + + + ##self.scratchDb.addRowCountColumn(cpsTableName, "row") Index: trunk/ippToPsps/jython/stackbatch.py =================================================================== --- trunk/ippToPsps/jython/stackbatch.py (revision 37586) +++ trunk/ippToPsps/jython/stackbatch.py (revision 37592) @@ -293,5 +293,5 @@ self.generateRandomIDs() - self.generateStackDetectRowIDs() + self.generateStackDetectRowIDsAndPspsUniqueIDs() # add indexes StackObjectThin @@ -944,5 +944,5 @@ def generateRandomIDs(self): - sql = "UPDATE StackObjectThin set randomStackObjID = FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)"; + sql = "UPDATE StackObjectThin set randomStackObjID = FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)" try: self.scratchDb.execute(sql) except: @@ -951,8 +951,9 @@ - def generateStackDetectRowIDs(self): + def generateStackDetectRowIDsAndPspsUniqueIDs(self): sql = "UPDATE StackObjectThin join (select @r:=@r+1 rownum, objID from \ (select @r:=0) r, StackObjectThin t) as foo using (objID) set \ - stackDetectRowID = ((" + str(self.batchID) + " << 32 ) + rownum)"; + stackDetectRowID = ((" + str(self.batchID) + " << 32 ) + rownum), \ + uniquePspsSTid = ((" +str(self.batchID) "*1000000000 ) + rownum)"; try: self.scratchDb.execute(sql) except: @@ -1011,5 +1012,5 @@ self.scratchDb.addColumn(table, filter + "haveData", "tinyint") - fields = "objID, ippObjID, randomStackObjID, primaryDetection, bestDetection, " + fields = "objID, ippObjID, randomStackObjID, primaryDetection, bestDetection, uniquePspsSTID, " for i in range(len(self.filters)): 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