IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37592 for trunk


Ignore:
Timestamp:
Nov 12, 2014, 2:58:40 PM (12 years ago)
Author:
heather
Message:

cleaning up the schema, and adding uniquePsps()id to all tables. Populated in
all except FO/FW/DF/DO (those are still in progress)

Location:
trunk/ippToPsps
Files:
48 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippToPsps/config/tables.DF.vot

    r37586 r37592  
    9494        <DESCRIPTION>ODM diff object identifier</DESCRIPTION>
    9595      </FIELD>
     96      <FIELD name="uniquePspsDFid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     97        <DESCRIPTION>unique psps diff detection id, based on batch + row number</DESCRIPTION>
     98      </FIELD>
    9699      <FIELD name="diffDetID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    97100        <DESCRIPTION>ODM diff detection identifier</DESCRIPTION>

  • trunk/ippToPsps/config/tables.DO.vot

    r37586 r37592  
    1111      <FIELD name="diffObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    1212        <DESCRIPTION>ODM object identifier index</DESCRIPTION>
     13      </FIELD>
     14      <FIELD name="uniquePspsDOid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     15        <DESCRIPTION>unique psps diff object id based on batch id and row number</DESCRIPTION>
    1316      </FIELD>
    1417      <FIELD name="ippObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">

  • trunk/ippToPsps/config/tables.FO.vot

    r37586 r37592  
    99        <DESCRIPTION>ODM object identifier index</DESCRIPTION>
    1010      </FIELD>
    11       <FIELD name="unique_psps_fo_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     11      <FIELD name="uniquePspsFOid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    1212        <DESCRIPTION>unique psps id</DESCRIPTION>
    1313      </FIELD>

  • trunk/ippToPsps/config/tables.FW.vot

    r37586 r37592  
    115115        <DESCRIPTION>ODM object identifier</DESCRIPTION>
    116116      </FIELD>
    117       <FIELD name="unique_psps_fw_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     117      <FIELD name="uniquePspsFWid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    118118        <DESCRIPTION>unique psps id</DESCRIPTION>
    119119      </FIELD>

  • trunk/ippToPsps/config/tables.OB.vot

    r37475 r37592  
    1212        <DESCRIPTION>ODM object identifier index</DESCRIPTION>
    1313      </FIELD>
    14       <FIELD name="unique_psps_ob_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     14      <FIELD name="uniquePspsOBid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    1515        <DESCRIPTION>unique psps id</DESCRIPTION>
    1616      </FIELD>
    … …  
    139139        <DESCRIPTION>ODM object identifier index</DESCRIPTION>
    140140      </FIELD>
    141       <FIELD name="unique_psps_ob_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     141      <FIELD name="uniquePspsOBid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    142142        <DESCRIPTION>unique psps id</DESCRIPTION>
    143143      </FIELD>

  • trunk/ippToPsps/config/tables.P2.vot

    r37586 r37592  
    383383        <DESCRIPTION>ODM object identifier</DESCRIPTION>
    384384      </FIELD>
    385       <FIELD name="unique_psps_p2_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     385      <FIELD name="uniquePspsP2id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    386386        <DESCRIPTION>unique psps id</DESCRIPTION>
    387387      </FIELD>

  • trunk/ippToPsps/config/tables.ST.vot

    r37577 r37592  
    131131        <DESCRIPTION>ODM object identifier</DESCRIPTION>
    132132      </FIELD>
    133       <FIELD name="unique_psps_st_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     133      <FIELD name="uniquePspsSTid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    134134        <DESCRIPTION>unique psps id</DESCRIPTION>
    135135      </FIELD>
    … …  
    474474        <DESCRIPTION>ODM object identifier</DESCRIPTION>
    475475      </FIELD>
    476       <FIELD name="unique_psps_st_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     476      <FIELD name="uniquePspsSTid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    477477        <DESCRIPTION>unique psps id</DESCRIPTION>
    478478      </FIELD>
    … …  
    10101010        <DESCRIPTION>ODM object identifier</DESCRIPTION>
    10111011      </FIELD>
    1012       <FIELD name="unique_psps_st_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     1012      <FIELD name="uniquePspsSTid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    10131013        <DESCRIPTION>unique psps id</DESCRIPTION>
    10141014      </FIELD>
    … …  
    16351635        <DESCRIPTION>ODM object identifier</DESCRIPTION>
    16361636      </FIELD>
    1637       <FIELD name="unique_psps_st_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     1637      <FIELD name="uniquePspsSTid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    16381638        <DESCRIPTION>unique psps id</DESCRIPTION>
    16391639      </FIELD>
    … …  
    18261826        <DESCRIPTION>ODM object identifier</DESCRIPTION>
    18271827      </FIELD>
    1828       <FIELD name="unique_psps_st_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     1828      <FIELD name="uniquePspsSTid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    18291829        <DESCRIPTION>unique psps id</DESCRIPTION>
    18301830      </FIELD>
    … …  
    21222122        <DESCRIPTION>ODM object identifier</DESCRIPTION>
    21232123      </FIELD>
    2124       <FIELD name="unique_psps_st_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     2124      <FIELD name="uniquePspsSTid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    21252125        <DESCRIPTION>unique psps id</DESCRIPTION>
    21262126      </FIELD>
    … …  
    24182418        <DESCRIPTION>ODM object identifier</DESCRIPTION>
    24192419      </FIELD>
    2420       <FIELD name="unique_psps_st_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     2420      <FIELD name="uniquePspsSTid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    24212421        <DESCRIPTION>unique psps id</DESCRIPTION>
    24222422      </FIELD>
    … …  
    27442744        <DESCRIPTION>ODM object identifier</DESCRIPTION>
    27452745      </FIELD>
    2746       <FIELD name="unique_psps_st_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     2746      <FIELD name="uniquePspsSTid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    27472747        <DESCRIPTION>unique psps id</DESCRIPTION>
    27482748      </FIELD>
    … …  
    34303430        <DESCRIPTION>ODM object identifier</DESCRIPTION>
    34313431      </FIELD>
    3432       <FIELD name="unique_psps_st_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     3432      <FIELD name="uniquePspsSTid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    34333433        <DESCRIPTION>unique psps id</DESCRIPTION>
    34343434      </FIELD>
    … …  
    41164116        <DESCRIPTION>ODM object identifier</DESCRIPTION>
    41174117      </FIELD>
    4118       <FIELD name="unique_psps_st_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     4118      <FIELD name="uniquePspsSTid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    41194119        <DESCRIPTION>unique psps id</DESCRIPTION>
    41204120      </FIELD>
    … …  
    48024802        <DESCRIPTION>ODM object identifier</DESCRIPTION>
    48034803      </FIELD>
    4804       <FIELD name="unique_psps_st_id" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     4804      <FIELD name="uniquePspsSTid" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    48054805        <DESCRIPTION>unique psps id</DESCRIPTION>
    48064806      </FIELD>

  • trunk/ippToPsps/jython/detectionbatch.py

    r37577 r37592  
    607607
    608608    '''
     609    Updates table and generates pspsuniqueids
     610    '''
     611
     612    def updatePspsUniqueIDs(self,table):
     613        sql = "UPDATE "+table+" join (select @r:=@r+1 rownum, objID from \
     614        (select @r:=0) r, "+table+" t) as foo using (objID) set \
     615        uniquePspsP2id = ((" +str(self.batchID)+ "*1000000000 ) + rownum)"
     616        try: self.scratchDb.execute(sql)
     617        except:
     618            self.logger.errorPair('failed sql',sql)
     619            return
     620       
     621    '''
    609622    Does the processing, i.e. pulling stuff from IPP tables into PSPS tables
    610623    '''
    … …  
    637650        results['NULLOBJID'] = self.scratchDb.reportAndDeleteRowsWithNULLS("Detection_" + chipname, "objID")
    638651        #self.logger.info("deleted nulls")
     652        self.logger.info("add psps unique p2 ids")
     653        self.updatePspsUniqueIDs("Detection_" + chipname, self.imageIDs[chipname])
    639654        self.updateImageID("Detection_" + chipname, x, y)
    640655        #self.logger.info("updateImageId")

  • trunk/ippToPsps/jython/forcedwarpbatch.py

    r37577 r37592  
    224224        self.generateRandomIDs()
    225225
     226        self.generateUniquePspsIDs()
     227           
    226228        # add indexes ForcedWarpMeasurement
    227229        self.scratchDb.createIndex("ForcedWarpMeasurement", "objID")
    … …  
    249251        self.tablesToExport.append("ForcedWarpExtended")
    250252
     253           # get dvo ids,
     254        # add in the psps unique ids from stuff
    251255
    252256    '''
    … …  
    326330
    327331    def generateRandomIDs(self):
    328            sql = "UPDATE ForcedWarpMeasurement set randomWarpID = FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)";
     332           sql = "UPDATE ForcedWarpMeasurement set randomWarpID = FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)"
    329333        try: self.scratchDb.execute(sql)
    330334        except:
    … …  
    333337
    334338
    335 
     339    '''
     340    Updates table and generates pspsuniqueids
     341    '''
     342
     343    def generatePspsUniqueIDs(self):
     344        sql = "UPDATE ForcedWarpMeasurement join (select @r:=@r+1 rownum, objID from \
     345        (select @r:=0) r, ForcedWarpMeasurement t) as foo using (objID) set \
     346        uniquePspsFWid = ((" +str(self.batchID)+ "*1000000000 ) + rownum)"
     347        try: self.scratchDb.execute(sql)
     348        except:
     349           self.logger.errorPair('failed sql',sql)
     350           return
     351           
    336352
    337353

  • trunk/ippToPsps/jython/objectbatch.py

    r37577 r37592  
    8787        return True
    8888
     89    '''
     90    Updates table and generates pspsuniqueids
     91    '''
     92   
     93    def updatePspsUniqueIDs(self):
     94        sql = "UPDATE ObjectThin join (select @r:=@r+1 rownum, objID from \
     95        (select @r:=0) r, ObjectThin t) as foo using (objID) set \
     96        uniquePspsP2id = ((" +str(self.batchID) "*1000000000 ) + rownum)";
     97        try: self.scratchDb.execute(sql)
     98        except:
     99            self.logger.errorPair('failed sql',sql)
     100            return
     101       
     102
     103   
    89104    '''
    90105    Applies indexes to the IPP tables
    … …  
    429444        ##self.dvoObjects.purgeRegion(self.region)
    430445
     446        self.updatePspsUniqueIDs()
     447       
    431448        self.setMinMaxObjID(["ObjectThin"])
    432449
    … …  
    439456        cptTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cpt")
    440457        cpsTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cps")
    441         self.logger.infoPair("Populating MeanObject from ", "ObjectThin")
    442 
    443         sql = "INSERT INTO MeanObject ( objID ) SELECT objID FROM ObjectThin"
     458        self.logger.infoPair("Populating MeanObject.objid and pspsUniqueOBid from ", "ObjectThin")
     459
     460        sql = "INSERT INTO MeanObject ( objID, pspsUniqueOBid ) SELECT objID, pspsUniqueOBid FROM ObjectThin"
    444461        try:
    445462            self.scratchDb.execute(sql)
    … …  
    450467        self.logger.infoPair("Adding 'row' columns to", "MeanObject table")
    451468        self.scratchDb.addRowCountColumn("MeanObject", "row")
    452  
     469
     470
     471
     472       
    453473
    454474        ##self.scratchDb.addRowCountColumn(cpsTableName, "row")

  • trunk/ippToPsps/jython/stackbatch.py

    r37586 r37592  
    293293        self.generateRandomIDs()
    294294
    295         self.generateStackDetectRowIDs()
     295        self.generateStackDetectRowIDsAndPspsUniqueIDs()
    296296
    297297        # add indexes StackObjectThin
    … …  
    944944
    945945    def generateRandomIDs(self):
    946         sql = "UPDATE StackObjectThin set randomStackObjID = FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)";
     946        sql = "UPDATE StackObjectThin set randomStackObjID = FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)"
    947947        try: self.scratchDb.execute(sql)
    948948        except:
    … …  
    951951
    952952
    953     def generateStackDetectRowIDs(self):
     953    def generateStackDetectRowIDsAndPspsUniqueIDs(self):
    954954        sql = "UPDATE StackObjectThin join (select @r:=@r+1 rownum, objID from \
    955955        (select @r:=0) r, StackObjectThin t) as foo using (objID) set \
    956         stackDetectRowID = ((" + str(self.batchID) + " << 32 ) + rownum)";
     956        stackDetectRowID = ((" + str(self.batchID) + " << 32 ) + rownum), \
     957        uniquePspsSTid = ((" +str(self.batchID) "*1000000000 ) + rownum)";
    957958        try: self.scratchDb.execute(sql)
    958959        except:
    … …  
    10111012            self.scratchDb.addColumn(table, filter + "haveData", "tinyint")
    10121013
    1013         fields = "objID, ippObjID, randomStackObjID, primaryDetection, bestDetection, "
     1014        fields = "objID, ippObjID, randomStackObjID, primaryDetection, bestDetection, uniquePspsSTID, "
    10141015
    10151016        for i in range(len(self.filters)):

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection

    r37474 r37592  
    11objID           dimensionless   BIGINT  8         NA    ODM object identifier
    2 unique_psps_p2_id dimensionless BIGINT  8         NA    unique identifier for psps based on batch_id, OTA, and counter (per detection)
     2uniquePspsP2id dimensionless BIGINT  8         NA    unique identifier for psps based on batch_id, OTA, and counter (per detection)
    33detectID        dimensionless   BIGINT  8         NA    ODM detection identifier
    44ippObjID        dimensionless   BIGINT  8         NA    detection id generated by IPP

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection.txt

    r37474 r37592  
    11objID           + dvo = average.extID [calculated in addstar]
    2 unique_psps_p2_id + ipptopsps : combination of batch_id, ota, and counter
     2uniquePspsP2id + ipptopsps : combination of batch_id, ota, and counter
    33detectID        + dvo = measure.extID [calculated in addstar]
    44ippObjID        + dvo = average.objID + (average.catID << 32) [NOTE: this is a change in definition]

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject

    r37586 r37592  
    22diffObjName     string          VAR     8       NA      IAU Name constructed from objID postion PS1.x JHHMMSS.SS+/-DDMMSS.S x procesing version       
    33diffObjID       dimensionless   BIGINT  8       NA      ODM object identifier index
    4 unique_psps_do_id dimentionless BIGINT  8       NA      unique id provided by ipptopsps, based on batch_Id + counter
     4uniquePspsDOid dimentionless BIGINT  8  NA      unique id provided by ipptopsps, based on batch_Id + counter
    55ippObjID        dimensionless   BIGINT  8       NA      IPP object number
    66surveyID        dimensionless   TINYINT 1       255     Survey ID

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject.txt

    r37586 r37592  
    22diffObjName      = ipptopsps
    33diffObjID        = dvo / addstar
    4 unique_psps_do_id = ipptopsps
     4uniquePspsDOid = ipptopsps
    55ippObjID         = dvo / addstar
    66surveyID         = ipptopsps

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection

    r37586 r37592  
    11
    22diffObjID       dimensionless   BIGINT  8       NA      diff object identifier
    3 unique_psps_df_id dimensionless BIGINT  8       NA      unique psps id (combination of batch_id, and counter) provided by ipptopsps
     3uniquePspsDFid dimensionless BIGINT  8  NA      unique psps id (combination of batch_id, and counter) provided by ipptopsps
    44diffDetID       dimensionless   BIGINT  8       NA      diff detection identifier
    55diffDetMetaID   dimensionless   BIGINT  8       NA      diff detection meta identifier

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection.txt

    r37586 r37592  
    11               
    22diffObjID        = dvo / addstar
    3 unique_psps_df_id = ipptopsps           
     3uniquePspsDFid  = ipptopsps             
    44diffDetID        = dvo / addstar
    55diffDetMetaID    = dvo / addstar

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject

    r37586 r37592  
    11
    22objID           dimensionless   BIGINT   8        NA    ODM object identifier index
    3 unique_psps_fo_id dimensionless BIGINT   8        NA    unique id supplied by ipptopsps
     3uniquePspsFOid dimensionless BIGINT   8   NA    unique id supplied by ipptopsps
    44ippObjID        dimensionless   BIGINT   8        NA    IPP object identifier
    55nDetections     dimensionless   SMALLINT 2      -999    total number of detection measurements in all filters

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject.txt

    r37586 r37592  
    11                 
    22objID            = cpt.extID
    3 unique_psps_fo_id  = ipptopsps
     3uniquePspsFOid  = ipptopsps
    44ippObjID         = cpt.objID | cpt.catID << 32
    55nDetections      = sql sum of cps.NCODE (xnTotal)

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpExtended

    r37586 r37592  
    11
    22objID           dimensionless   BIGINT  8       NA      ODM object identifier
    3 unique_psps_fw_id dimentionless BIGINT  8       NA      unique id supplied by ipptopsps
     3uniquePspsFWid dimentionless BIGINT  8  NA      unique id supplied by ipptopsps
    44detectID        dimensionless   BIGINT  8       NA      ODM detection identifier
    55ippObjID        dimensionless   BIGINT  8       NA      ippobject id generated by IPP

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpExtended.txt

    r37586 r37592  
    11
    22objID            = cpt.extID (???)
    3 unique_psps_fw_id = ipptopsps
     3uniquePspsFWid = ipptopsps
    44detectID         = cpm.extID (???)
    55ippObjID         = cpx.obj_ID | cpx.cat_ID << 32

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement

    r37586 r37592  
    11
    22objID           dimensionless   BIGINT  8       NA      ODM object identifier
    3 unique_psps_fw_id dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
     3uniquePspsFWid dimensionless BIGINT  8  NA      unique identifier provided by ipptopsps
    44detectID        dimensionless   BIGINT  8       NA      ODM detection identifier
    55ippObjID        dimensionless   BIGINT  8       NA      ippobject id generated by IPP

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement.txt

    r37586 r37592  
    11
    22objID            = cpt.extID (???)
    3 unique_psps_fw_id = ipptopsps
     3uniquePspsFWid  = ipptopsps
    44detectID         = cpm.extID (???)
    55ippObjID         = cpx.obj_id | cps.cat_id << 32

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject

    r37474 r37592  
    44
    55objID           dimensionless   BIGINT   8       NA      ODM object identifier index
    6 unique_psps_ob_id dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
     6uniquePspsOBid dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
    77gQfPerfect      dimensionless   REAL     4       -999    maximum psf qfPerfect from best available g band detections
    88gMeanPSFMag     AB_magnitude    REAL     4       -999    mean g psf AB magnitude from best available measurements (best available as current defined by ipp "waterfall logic" 

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject.txt

    r37474 r37592  
    33
    44objID           + dvo / addstar
    5 unique_psps_ob_id = ipptopsps
     5uniquePspsOBid = ipptopsps
    66gQfPerfect      + dvo / relphot / secfilt.psfQfMax
    77gMeanPSFMag     + dvo / relphot / secfilt.M

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin

    r37474 r37592  
    22objName          string         VAR      8      NA      IAU Name constructed from objID postion PS1.x JHHMMSS.SS+/-DDMMSS.S where x is leading number of procesing version       
    33objID            dimensionless  BIGINT   8      NA      ODM object identifier index
    4 unique_psps_ob_id dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
     4uniquePspsOBid  dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
    55ippObjID         dimensionless  BIGINT   8      NA      IPP object number
    66surveyID         dimensionless  TINYINT  1      255     Survey ID

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin.txt

    r37474 r37592  
    22objName           - ipptopsps : move to dvopsps?
    33objID             + dvo:average.extID
    4 unique_psps_ob_id = ipptopsps
     4uniquePspsOBid    = ipptopsps
    55ippObjID          + dvo:(average.objID | average.catID << 32)
    66surveyID          + ipptopsps : internal, from survey name

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx

    r37475 r37592  
    11
    22objID            dimensionless  BIGINT  8       NA      ODM object identifier
    3 unique_psps_st_id dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
     3uniquePspsSTid  dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
    44ippObjID         dimensionless  BIGINT  8       NA      ipp object identifier
    55randomStackObjID dimensionless  BIGINT  8       NA      random stack id

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx.txt

    r37475 r37592  
    11
    22objID            + from StackObjectThin                               
    3 unique_psps_st_id = ipptopsps
     3uniquePspsSTid = ipptopsps
    44ippObjID         + from StackObjectThin                               
    55randomStackObjID + from StackObjectThin                               

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6

    r37475 r37592  
    11
    22objID            dimensionless  BIGINT  8       NA      ODM object identifier
    3 unique_psps_st_id dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
     3uniquePspsSTid dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
    44ippObjID         dimensionless  BIGINT  8       NA      object ID generated by IPP
    55randomStackObjID dimensionless  BIGINT  8       NA      random stack id

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon6.txt

    r37475 r37592  
    11
    22objID            + from StackObjectThin                               
    3 unique_psps_st_id = ipptopsps
     3uniquePspsSTid  = ipptopsps
    44ippObjID         + from StackObjectThin                               
    55randomStackObjID + from StackObjectThin                               

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8

    r37475 r37592  
    11
    22objID            dimensionless  BIGINT  8       NA      ODM object identifier
    3 unique_psps_st_id dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
     3uniquePspsSTid dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
    44ippObjID         dimensionless  BIGINT  8       NA      object ID generated by IPP
    55randomStackObjID dimensionless  BIGINT  8       NA      random stack id

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGCon8.txt

    r37475 r37592  
    11
    22objID            + from StackObjectThin                               
    3 unique_psps_st_id = ipptopsps
     3uniquePspsSTid  = ipptopsps
    44ippObjID         + from StackObjectThin                               
    55randomStackObjID + from StackObjectThin                               

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGUnc

    r37474 r37592  
    11
    22objID            dimensionless  BIGINT  8       NA      ODM object identifier
    3 unique_psps_st_id dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
     3uniquePspsSTid dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
    44ippObjID         dimensionless  BIGINT  8       NA      object ID generated by IPP
    55randomStackObjID dimensionless  BIGINT  8       NA      random stack id

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlxEGUnc.txt

    r37474 r37592  
    11
    22objID            + from StackObjectThin                               
    3 unique_psps_st_id = ipptopsps
     3uniquePspsSTid  = ipptopsps
    44ippObjID         + from StackObjectThin                               
    55randomStackObjID + from StackObjectThin                               

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitDeV

    r37474 r37592  
    11
    22objID            dimensionless  BIGINT  8       NA      ODM object identifier
    3 unique_psps_st_id dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
     3uniquePspsSTid dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
    44ippObjID         dimensionless  BIGINT  8       NA      object ID generated by IPP
    55randomStackObjID dimensionless  BIGINT  8       NA      random stack id

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitDeV.txt

    r37474 r37592  
    11
    22objID            + from StackObjectThin                       
    3 unique_psps_st_id = ipptopsps
     3uniquePspsSTid = ipptopsps
    44ippObjID         + from StackObjectThin                       
    55randomStackObjID + from StackObjectThin                       

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExp

    r37474 r37592  
    11
    22objID            dimensionless  BIGINT  8       NA      ODM object identifier
    3 unique_psps_st_id dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
     3uniquePspsSTid dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
    44ippObjID         dimensionless  BIGINT  8       NA      object ID generated by IPP
    55randomStackObjID dimensionless  BIGINT  8       NA      random stack id

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExp.txt

    r37474 r37592  
    11
    22objID            + from StackObjectThin                       
    3 unique_psps_st_id = ipptopsps
     3uniquePspsSTid = ipptopsps
    44ippObjID         + from StackObjectThin                       
    55randomStackObjID + from StackObjectThin                       

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitExtra

    r37475 r37592  
    11
    22objID            dimensionless  BIGINT  8       NA      ODM object identifier
    3 unique_psps_st_id dimensionless BIGINT  8       NA      unique ipptopsps id
     3uniquePspsSTid dimensionless BIGINT  8  NA      unique ipptopsps id
    44ippObjID         dimensionless  BIGINT  8       NA      object ID generated by IPP
    55randomStackObjID dimensionless  BIGINT  8       NA      random stack id

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitSer

    r37474 r37592  
    11
    22objID            dimensionless  BIGINT  8       NA      ODM object identifier
    3 unique_psps_st_id dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
     3uniquePspsSTid dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
    44ippObjID         dimensionless  BIGINT  8       NA      object ID generated by IPP
    55randomStackObjID dimensionless  BIGINT  8       NA      random stack id

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFitSer.txt

    r37474 r37592  
    11
    22objID            + from StackObjectThin                       
    3 unique_psps_st_id = ipptopsps
     3uniquePspsSTid  = ipptopsps
    44ippObjID         + from StackObjectThin                       
    55randomStackObjID + from StackObjectThin                       

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectAttributes

    r37577 r37592  
    11
    22objID             dimensionless   BIGINT  8       NA      ODM object identifie
    3 unique_psps_st_id dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
     3uniquePspsSTid dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
    44ippObjID          dimensionless   BIGINT  8       NA      object ID generated by IPP
    55randomStackObjID  dimensionless   BIGINT  8       NA      random stack id

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectAttributes.txt

    r37577 r37592  
    11
    22objID             + from StackObjectThin
    3 unique_psps_st_id = ipptopsps
     3uniquePspsSTid = ipptopsps
    44ippObjID          + from StackObjectThin
    55randomStackObjID  + from StackObjectThin

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectThin

    r37474 r37592  
    11
    22objID             dimensionless   BIGINT   8       NA      ODM object identifier
    3 unique_psps_st_id dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
     3uniquePspsSTid dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
    44ippObjID          dimensionless   BIGINT   8       NA      object ID generated by IPP  [this is a per-object, not per-filter value]
    55surveyID          dimensionless   TINYINT  1       NA      survey flag identifier

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectThin.txt

    r37474 r37592  
    33
    44objID              + dvo = average.extID   [calculated in addstar]
    5 unique_psps_st_id = ipptopsps
     5uniquePspsSTid = ipptopsps
    66ippObjID           + dvo = average.objID + (average.catID << 32) [NOTE: this is a change in definition]
    77surveyID           + ipptopsps : internal, from survey name

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackPetrosian

    r37474 r37592  
    11
    22objID            dimensionless  BIGINT  8       NA      ODM object identifier
    3 unique_psps_st_id dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
     3uniquePspsSTid dimensionless BIGINT  8       NA      unique identifier provided by ipptopsps
    44ippbjID          dimensionless  BIGINT  8       NA      object ID generated by IPP
    55randomStackObjID dimensionless  BIGINT  8       NA      random stack id

  • trunk/ippToPsps/pspsschema/SchemaNew19.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackPetrosian.txt

    r37474 r37592  
    11
    22objID            + from StackObjectThin
    3 unique_psps_st_id = ipptopsps
     3uniquePspsSTid = ipptopsps
    44ippobjID                 + from StackObjectThin
    55randomStackObjID + from StackObjectThin
Note: See TracChangeset for help on using the changeset viewer.