IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37106


Ignore:
Timestamp:
Jul 24, 2014, 10:12:36 AM (12 years ago)
Author:
heather
Message:

current version

Location:
trunk/ippToPsps
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r36698 r37106  
    303303      </DATA>
    304304    </TABLE>
    305   </RESOURCE>
     305    <TABLE name="SkinnyObject">
     306      <DESCRIPTION>VOTable description of PSPS table SkinnyObject</DESCRIPTION>
     307      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
     308      <FIELD name="objID" arraysize="1" datatype="long">
     309        <DESCRIPTION>ODM object identifier index</DESCRIPTION>
     310      </FIELD>
     311      <FIELD name="ippObjID" arraysize="1" datatype="long">
     312        <DESCRIPTION>IPP object number</DESCRIPTION>
     313      </FIELD>
     314      <FIELD name="projectionCellID" arraysize="1" datatype="int">
     315        <DESCRIPTION>projection cell identifier at discovery time</DESCRIPTION>
     316      </FIELD>
     317      <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte">
     318        <DESCRIPTION>Data release to propagate to the object</DESCRIPTION>
     319      </FIELD>
     320      <FIELD name="surveyID" arraysize="1" datatype="unsignedByte">
     321        <DESCRIPTION>surveyID &lt;/coluumn&gt;</DESCRIPTION>
     322      </FIELD>
     323      <DATA>
     324        <TABLEDATA></TABLEDATA>
     325      </DATA>
     326    </TABLE>
     327   </RESOURCE>
    306328</VOTABLE>

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

    r36698 r37106  
    352352      </DATA>
    353353    </TABLE>
    354   </RESOURCE>
     354    <TABLE name="SkinnyObject">
     355      <DESCRIPTION>VOTable description of PSPS table SkinnyObject</DESCRIPTION>
     356      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
     357      <FIELD name="objID" arraysize="1" datatype="long">
     358        <DESCRIPTION>ODM object identifier index</DESCRIPTION>
     359      </FIELD>
     360      <FIELD name="ippObjID" arraysize="1" datatype="long">
     361        <DESCRIPTION>IPP object number</DESCRIPTION>
     362      </FIELD>
     363      <FIELD name="projectionCellID" arraysize="1" datatype="int">
     364        <DESCRIPTION>projection cell identifier at discovery time</DESCRIPTION>
     365      </FIELD>
     366      <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte">
     367        <DESCRIPTION>Data release to propagate to the object</DESCRIPTION>
     368      </FIELD>
     369      <FIELD name="surveyID" arraysize="1" datatype="unsignedByte">
     370        <DESCRIPTION>surveyID &lt;/coluumn&gt;</DESCRIPTION>
     371      </FIELD>
     372      <DATA>
     373        <TABLEDATA></TABLEDATA>
     374      </DATA>
     375    </TABLE>
     376   </RESOURCE>
    355377</VOTABLE>

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

    r36715 r37106  
    558558      </DATA>
    559559    </TABLE>
     560    <TABLE name="SkinnyObject">
     561      <DESCRIPTION>VOTable description of PSPS table SkinnyObject</DESCRIPTION>
     562      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
     563      <FIELD name="objID" arraysize="1" datatype="long" unit="unknown">
     564        <DESCRIPTION>ODM object identifier index</DESCRIPTION>
     565      </FIELD>
     566      <FIELD name="ippObjID" arraysize="1" datatype="long" unit="unknown">
     567        <DESCRIPTION>IPP object number</DESCRIPTION>
     568      </FIELD>
     569      <FIELD name="projectionCellID" arraysize="1" datatype="int" unit="unknown">
     570        <DESCRIPTION>projection cell identifier at discovery time</DESCRIPTION>
     571      </FIELD>
     572      <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="unknown">
     573        <DESCRIPTION>Data release to propagate to the object</DESCRIPTION>
     574      </FIELD>
     575      <FIELD name="surveyID" arraysize="1" datatype="unsignedByte" unit="unknown">
     576        <DESCRIPTION>surveyID &lt;/coluumn&gt;</DESCRIPTION>
     577      </FIELD>
     578      <DATA>
     579        <TABLEDATA></TABLEDATA>
     580      </DATA>
     581    </TABLE>
    560582  </RESOURCE>
    561583</VOTABLE>

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

    r36744 r37106  
    42144214      </DATA>
    42154215    </TABLE>
     4216    <TABLE name="SkinnyObject">
     4217      <DESCRIPTION>VOTable description of PSPS table SkinnyObject</DESCRIPTION>
     4218      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
     4219      <FIELD name="objID" arraysize="1" datatype="long">
     4220        <DESCRIPTION>ODM object identifier index</DESCRIPTION>
     4221      </FIELD>
     4222      <FIELD name="ippObjID" arraysize="1" datatype="long">
     4223        <DESCRIPTION>IPP object number</DESCRIPTION>
     4224      </FIELD>
     4225      <FIELD name="projectionCellID" arraysize="1" datatype="int">
     4226        <DESCRIPTION>projection cell identifier at discovery time</DESCRIPTION>
     4227      </FIELD>
     4228      <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte">
     4229        <DESCRIPTION>Data release to propagate to the object</DESCRIPTION>
     4230      </FIELD>
     4231      <FIELD name="surveyID" arraysize="1" datatype="unsignedByte">
     4232        <DESCRIPTION>surveyID &lt;/coluumn&gt;</DESCRIPTION>
     4233      </FIELD>
     4234      <DATA>
     4235        <TABLEDATA></TABLEDATA>
     4236      </DATA>
     4237    </TABLE>
    42164238  </RESOURCE>
    42174239</VOTABLE>

  • trunk/ippToPsps/jython/detectionbatch.py

    r36744 r37106  
    547547
    548548        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.skychunk.dataRelease))
     549    '''
     550    Populates the SkinnyObject table for this OTA
     551    '''
     552    def populateSkinnyObjectTable(self, ota):
     553
     554        tableName = "SkinnyObject_" + ota
     555       
     556        # drop then re-create table
     557        self.scratchDb.dropTable(tableName)
     558        sql = "CREATE TABLE " + tableName + " LIKE SkinnyObject"
     559        try: self.scratchDb.execute(sql)
     560        except: pass
     561
     562        # insert all detections into table
     563        sql = "INSERT INTO " + tableName + " ( \
     564               objID \
     565               ,ippObjID \
     566               ,surveyID \
     567               ) \
     568               SELECT \
     569               objID \
     570               ,ippObjID \
     571               ,surveyID \
     572               FROM Detection_" + ota
     573        self.scratchDb.execute(sql)
     574
     575        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.skychunk.dataRelease))
     576
     577
    549578
    550579    '''
    … …  
    854883       
    855884        #self.logger.info("updated imagedata")
    856        
     885        self.populateSkinnyObjectTable(chipname)
     886        self.logger.info("updated skinnyobject")
     887 
    857888        self.populateDetectionCalibTable(chipname)
    858889        #self.logger.info("updated detectioncalibtable")
    … …  
    865896        self.logger.info("export Detection")
    866897
    867        
     898        self.tablesToExport.append("SkinnyObject_" + chipname)
     899        self.logger.info("export Skinny")
     900
     901
    868902        tables.append("Detection_" + chipname)
    869903        self.logger.info("updated detectioncalibtable")

  • trunk/ippToPsps/jython/stackbatch.py

    r36744 r37106  
    1 #!/usr/bin/env jython
     1q#!/usr/bin/env jython
    22
    33import os.path
    … …  
    215215       self.scratchDb.dropTable("StackObject")
    216216       self.logger.infoPair("dropping table:","StackModelFit")
    217               
     217       self.scratchDb.dropTable("SkinnyObject")
    218218       self.scratchDb.dropTable("StackModelFit")
    219219       self.logger.infoPair("dropping table:","StackApFlx")
    … …  
    785785        self.logger.infoPair("Deleting", "entries with StackObject.objID = 0")
    786786        # response = raw_input("deleted objID is 0 ")
    787        
     787    '''
     788    Populates the SkinnyObject table
     789    '''
     790    def populateSkinnyObject(self):
     791
     792        self.logger.infoPair("Procesing table", "SkinnyObject")
     793
     794        sql = "INSERT INTO SkinnyObject (\
     795               objID \
     796               ,ippObjID \
     797               ,projectionCellID \
     798               ) \
     799               SELECT \
     800               DISTINCT objID \
     801               ,ippObjID \
     802               ,projectionCellID \
     803               FROM StackDetection"
     804        self.scratchDb.execute(sql)
     805
     806        self.scratchDb.updateAllRows("SkinnyObject", "surveyID", str(self.surveyID))
     807        self.scratchDb.updateAllRows("SkinnyObject", "dataRelease", str(self.skychunk.dataRelease))
     808         
    788809
    789810    '''
    … …  
    13071328
    13081329        ##if self.totalDetections < 1:
     1330        #self.logger.infoPair("populating","SkinnyObject")
     1331        self.populateSkinnyObject()
    13091332
    13101333            ##self.logger.error("No detections to publish")
    … …  
    13141337        self.tablesToExport.append("StackModelFit")
    13151338        self.tablesToExport.append("StackApFlx")
    1316 
     1339        self.tablesToExport.append("SkinnyObject")
    13171340        self.logger.infoPair("finishing","populatePspsTables");
    13181341        return True
Note: See TracChangeset for help on using the changeset viewer.