IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 39029 for trunk


Ignore:
Timestamp:
Nov 2, 2015, 4:32:17 PM (11 years ago)
Author:
watersc1
Message:

As per discussion, drop ForcedSummaryToImage and ForcedSummaryMeta tables, as they duplicate information better accesed via the ForcedWarp/Stack tables. Changed XforcedSummaryID to XstackImageID to the link back to stack information, and to match the IMAGE_ID populated from DVO. Change forcedgalaxybatch.py to know this column name change, and cut commented code that was to implement the dropped tables from forcedwarpbatch.py.

Location:
trunk/ippToPsps
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippToPsps/config/schema_browser.vot

    r38962 r39029  
    134134     <TABLE name="WarpToImage"> </TABLE>
    135135     <TABLE name="ForcedWarpToImage"> </TABLE>
    136      <TABLE name="ForcedSummaryToImage"> </TABLE>
    137136
    138137     <TABLE name="StackMeta"> </TABLE>
    139138     <TABLE name="DiffMeta"> </TABLE>
    140139     <TABLE name="ForcedWarpMeta"></TABLE>
    141      <TABLE name="ForcedSummaryMeta"></TABLE>
    142140     
    143141     <TABLE name="ImageDetEffMeta"> </TABLE>

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

    r38965 r39029  
    33<VOTABLE version="1.1">
    44  <RESOURCE>
    5     <TABLE name="ForcedSummaryMeta">
    6       <DESCRIPTION>Contains the metadata linking the stacked image used to generate sources to the summary of the single epoch forced warp photometry.</DESCRIPTION>
    7       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
    8       <FIELD name="forcedSummaryID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    9         <DESCRIPTION>Unique forced warp summary identifier.</DESCRIPTION>
    10       </FIELD>
    11       <FIELD name="batchID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    12         <DESCRIPTION>Internal database batch identifier.</DESCRIPTION>
    13       </FIELD>
    14       <FIELD name="surveyID" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    15         <DESCRIPTION>Survey identifier.  Details in the Survey table.</DESCRIPTION>
    16       </FIELD>
    17       <FIELD name="filterID" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    18         <DESCRIPTION>Filter identifier.  Details in the Filter table.</DESCRIPTION>
    19       </FIELD>
    20       <FIELD name="stackMetaID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    21         <DESCRIPTION>Unique stack identifier.</DESCRIPTION>
    22       </FIELD>
    23       <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    24         <DESCRIPTION>Data release version.</DESCRIPTION>
    25       </FIELD>
    26       <DATA>
    27         <TABLEDATA></TABLEDATA>
    28       </DATA>
    29     </TABLE>
    305    <TABLE name="ForcedGalaxyShape">
    316      <DESCRIPTION>Contains the extended source galaxy shape parameters.  All filters are matched into a single row.  References:  Sersic, J. L. 1963, Boletin de la Asociacion Argentina de Astronomia La Plata Argentina, 6, 41.</DESCRIPTION>
    … …  
    5328        <DESCRIPTION>IPP internal detection identifier.</DESCRIPTION>
    5429      </FIELD>
    55       <FIELD name="gforcedSummaryID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    56         <DESCRIPTION>Unique forced warp summary identifier.</DESCRIPTION>
     30      <FIELD name="gstackImageID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     31        <DESCRIPTION>Unique stack identifier for the g filter stack that was the original detection source.</DESCRIPTION>
    5732      </FIELD>
    5833      <FIELD name="gGalMajor" arraysize="1" datatype="float" unit="arcsec" default="-999">
    … …  
    8156        <DESCRIPTION>IPP internal detection identifier.</DESCRIPTION>
    8257      </FIELD>
    83       <FIELD name="rforcedSummaryID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    84         <DESCRIPTION>Unique forced warp summary identifier.</DESCRIPTION>
     58      <FIELD name="rstackImageID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     59        <DESCRIPTION>Unique stack identifier for the r filter stack that was the original detection source.</DESCRIPTION>
    8560      </FIELD>
    8661      <FIELD name="rGalMajor" arraysize="1" datatype="float" unit="arcsec" default="-999">
    … …  
    11085      </FIELD>
    11186      <FIELD name="iforcedSummaryID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    112         <DESCRIPTION>Unique forced warp summary identifier.</DESCRIPTION>
     87        <DESCRIPTION>Unique stack identifier for the i filter stack that was the original detection source.</DESCRIPTION>
    11388      </FIELD>
    11489      <FIELD name="iGalMajor" arraysize="1" datatype="float" unit="arcsec" default="-999">
    … …  
    137112        <DESCRIPTION>IPP internal detection identifier.</DESCRIPTION>
    138113      </FIELD>
    139       <FIELD name="zforcedSummaryID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    140         <DESCRIPTION>Unique forced warp summary identifier.</DESCRIPTION>
     114      <FIELD name="zstackImageID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     115        <DESCRIPTION>Unique stack identifier for the z filter stack that was the original detection source.</DESCRIPTION>
    141116      </FIELD>
    142117      <FIELD name="zGalMajor" arraysize="1" datatype="float" unit="arcsec" default="-999">
    … …  
    165140        <DESCRIPTION>IPP internal detection identifier.</DESCRIPTION>
    166141      </FIELD>
    167       <FIELD name="yforcedSummaryID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    168         <DESCRIPTION>Unique forced warp summary identifier.</DESCRIPTION>
     142      <FIELD name="ystackImageID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     143        <DESCRIPTION>Unique stack identifier for the z filter stack that was the original detection source.</DESCRIPTION>
    169144      </FIELD>
    170145      <FIELD name="yGalMajor" arraysize="1" datatype="float" unit="arcsec" default="-999">
    … …  
    193168      </DATA>
    194169    </TABLE>
    195     <TABLE name="ForcedSummaryToImage">
    196       <DESCRIPTION>Contains the mapping of which input images were used for the forced photometry summary.</DESCRIPTION>
    197       <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
    198       <FIELD name="forcedSummaryID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    199         <DESCRIPTION>Unique forced warp summary identifier.</DESCRIPTION>
    200       </FIELD>
    201       <FIELD name="imageID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    202         <DESCRIPTION>Unique image identifier.  Constructed as (100 * frameID + ccdID).</DESCRIPTION>
    203       </FIELD>
    204       <DATA>
    205         <TABLEDATA></TABLEDATA>
    206       </DATA>
    207     </TABLE>
    208170   </RESOURCE>
    209171</VOTABLE>

  • trunk/ippToPsps/jython/forcedgalaxybatch.py

    r39027 r39029  
    153153            sqlLine = sqlUtility("UPDATE ForcedGalaxyShape AS a, " + cpqTable + " AS b SET")
    154154            sqlLine.group("a." + filter[1] + "ippDetectID",     "b.DET_ID")
    155             sqlLine.group("a." + filter[1] + "forcedSummaryID", "b.IMAGE_ID")
     155            sqlLine.group("a." + filter[1] + "stackImageID",    "b.IMAGE_ID")
    156156            sqlLine.group("a." + filter[1] + "GalMajor",        "b.MAJOR_AXIS")
    157157            sqlLine.group("a." + filter[1] + "GalMajorErr",     "b.MAJOR_AXIS_ERR")

  • trunk/ippToPsps/jython/forcedwarpbatch.py

    r38999 r39029  
    646646
    647647
    648 #     '''
    649 #     Populate the ForcedSummaryMeta table, which should be fairly easy as it contains very little.
    650 #     '''
    651 #     def populateForcedSummaryMeta(self,num):
    652 #         forcedSummaryID = self.number[num]
    653 #         self.logger.infoPair("Processing table", "ForcedSummaryMeta_"+forcedSummaryID)
    654 
    655 #         sql = "CREATE TABLE ForcedSummaryMeta_"+forcedSummaryID+" LIKE ForcedSummaryMeta"
    656 #         try: self.scratchDb.execute(sql)
    657 #         except: pass
    658 
    659 #         header = self.header[num]
    660 #         self.logger.infoPair("found header", "ok")
    661 
    662 #         sqlLine = sqlUtility("INSERT INTO ForcedSummaryMeta_"+forcedSummaryID+" (")
    663        
    664 #         sqlLine.group("forcedSummaryID", forcedSummaryID)
    665 #         sqlLine.group("batchID",         str(self.batchID))
    666 #         sqlLine.group("surveyID",        str(self.surveyID))
    667 #         sqlLine.group("filterID",        str(self.filterID))
    668 #         sqlLine.group("stackMetaID", self.stackID[num])
    669 #         sqlLine.group("processingVersion", str(self.skychunk.processingVersion))
    670 
    671 
    672 #         sql = sqlLine.make(") VALUES ( ", ")")
    673 
    674 #         try: self.scratchDb.execute(sql)
    675 #         except:
    676 #             self.logger.errorPair('failed sql: ', sql)
    677 #             raise
    678        
    679 #     # End populateForcedSummaryMeta?
    680 
    681 #     '''
    682 #     Populate the ForcedSummaryToImage table, which has even less.
    683 #     '''
    684 #     def populateForcedSummaryToImage(self,num):
    685 #         forcedSummaryID = self.number[num]
    686 #         self.logger.infoPair("Processing table", "ForcedSummaryToImage_"+str(forcedSummaryID))
    687 
    688 #         sql = "CREATE TABLE ForcedSummaryToImage_"+str(forcedSummaryID)+" LIKE ForcedSummaryToImage"
    689 #         try: self.scratchDb.execute(sql)
    690 #         except: pass
    691 
    692 #         if forcedSummaryID > 0:
    693 #             imageIDs = self.gpc1Db.getImageIDsForThisForcedSummaryID(forcedSummaryID)
    694 #             for imageID in imageIDs:
    695 #                 sql = "INSERT INTO ForcedWarpSummaryToImage_"+str(forcedSummaryID)+" (forcedSummaryId, imageID) VALUES (" + str(forcedSummaryID) + ", " + str(imageID) + ")"
    696 #                 try: self.scratchDb.execute(sql)
    697 #                 except:
    698 #                     self.logger.infoPair("can't execute sql", sql)
    699 #                     raise
    700 
    701 #     # End populateForcedSummaryToImage?
    702 
    703648
    704649    '''
Note: See TracChangeset for help on using the changeset viewer.