IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38763 for trunk


Ignore:
Timestamp:
Sep 21, 2015, 11:54:38 AM (11 years ago)
Author:
heather
Message:

various changes, mostly related to changing dataRelease to processingVersion

Location:
trunk/ippToPsps
Files:
17 edited

Legend:

Unmodified
Added
Removed

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

    r38762 r38763  
    8181        <DESCRIPTION>Linear transformation matrix element between image pixel y and declination.</DESCRIPTION>
    8282      </FIELD>
    83       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     83      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    8484        <DESCRIPTION>Data release version.</DESCRIPTION>
    8585      </FIELD>
    … …  
    289289        <DESCRIPTION>Information flag bitmask indicating details of the photometry.  Values listed in DetectionFlags3.</DESCRIPTION>
    290290      </FIELD>
    291       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     291      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    292292        <DESCRIPTION>Data release version.</DESCRIPTION>
    293293      </FIELD>

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

    r38751 r38763  
    9393        <DESCRIPTION>Maximum PSF weighted fraction of pixels totally unmasked from y filter detections.</DESCRIPTION>
    9494      </FIELD>
    95       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     95      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    9696        <DESCRIPTION>Data release version.</DESCRIPTION>
    9797      </FIELD>

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

    r38751 r38763  
    2121        <DESCRIPTION>Unique stack identifier.</DESCRIPTION>
    2222      </FIELD>
    23       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     23      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    2424        <DESCRIPTION>Data release version.</DESCRIPTION>
    2525      </FIELD>

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

    r38751 r38763  
    2424        <DESCRIPTION>Internal database batch identifier.</DESCRIPTION>
    2525      </FIELD>
    26       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     26      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    2727        <DESCRIPTION>Data release version.</DESCRIPTION>
    2828      </FIELD>
    … …  
    523523        <DESCRIPTION>Internal database batch identifier.</DESCRIPTION>
    524524      </FIELD>
    525       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     525      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    526526        <DESCRIPTION>Data release version.</DESCRIPTION>
    527527      </FIELD>

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

    r38760 r38763  
    9696        <DESCRIPTION>Linear transformation matrix element between image pixel y and declination.</DESCRIPTION>
    9797      </FIELD>
    98       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     98      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    9999        <DESCRIPTION>Data release version.</DESCRIPTION>
    100100      </FIELD>
    … …  
    253253        <DESCRIPTION>Information flag bitmask indicating details of the photometry.  Values listed in DetectionFlags3.</DESCRIPTION>
    254254      </FIELD>
    255       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     255      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    256256        <DESCRIPTION>Data release version.</DESCRIPTION>
    257257      </FIELD>

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

    r38751 r38763  
    4545        <DESCRIPTION>Internal DVO region identifier.</DESCRIPTION>
    4646      </FIELD>
    47       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     47      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    4848        <DESCRIPTION>Data release version.</DESCRIPTION>
    4949      </FIELD>

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

    r38762 r38763  
    147147        <DESCRIPTION>Internal database batch identifier.</DESCRIPTION>
    148148      </FIELD>
    149       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     149      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    150150        <DESCRIPTION>Data release version.</DESCRIPTION>
    151151      </FIELD>
    … …  
    361361        <DESCRIPTION>Polynomial coefficient for the astrometric fit component (x^0 y^2) for focal plane M.</DESCRIPTION>
    362362      </FIELD>
    363       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     363      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    364364        <DESCRIPTION>Data release version.</DESCRIPTION>
    365365      </FIELD>
    … …  
    542542        <DESCRIPTION>Information flag bitmask indicating details of the photometry.  Values listed in DetectionFlags3.</DESCRIPTION>
    543543      </FIELD>
    544       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     544      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    545545        <DESCRIPTION>Data release version.</DESCRIPTION>
    546546      </FIELD>

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

    r38762 r38763  
    110110        <DESCRIPTION>Linear transformation matrix element between image pixel y and declination.</DESCRIPTION>
    111111      </FIELD>
    112       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     112      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    113113        <DESCRIPTION>Data release version.</DESCRIPTION>
    114114      </FIELD>
    … …  
    158158        <DESCRIPTION>Internal DVO region identifier.</DESCRIPTION>
    159159      </FIELD>
    160       <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
     160      <FIELD name="processingVersion" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    161161        <DESCRIPTION>Data release version.</DESCRIPTION>
    162162      </FIELD>

  • trunk/ippToPsps/jython/detectionbatch.py

    r38761 r38763  
    179179        self.scratchDb.updateAllRows("FrameMeta", "surveyID", str(self.surveyID))
    180180        self.scratchDb.updateFilterID("FrameMeta", self.filter)
    181         self.scratchDb.updateAllRows("FrameMeta", "dataRelease", str(self.skychunk.dataRelease))
     181        self.scratchDb.updateAllRows("FrameMeta", "processingVersion", str(self.skychunk.processingVersion))
    182182
    183183    '''
    … …  
    296296
    297297        self.scratchDb.updateFilterID(tableName, self.filter)
    298         self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.skychunk.dataRelease))
     298        self.scratchDb.updateAllRows(tableName, "processingVersion", str(self.skychunk.processingVersion))
    299299        if 'NASTRO' in header: self.totalNumPhotoRef = self.totalNumPhotoRef + int(header['NASTRO'])
    300300        self.scratchDb.replaceNullsInThisColumn(tableName, "polyOrder", "0")
    … …  
    460460        sqlLine.group("infoFlag",        "FLAGS")                         
    461461        sqlLine.group("infoFlag2",       "FLAGS2")                         
    462         sqlLine.group("dataRelease",     str(self.skychunk.dataRelease))                 
     462        sqlLine.group("processingVersion",     str(self.skychunk.processingVersion))                 
    463463
    464464        sql = sqlLine.makeRaw(") SELECT ", " FROM " + ippTableName)
    … …  
    518518        self.scratchDb.execute(sql)
    519519
    520         self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.skychunk.dataRelease))
     520        self.scratchDb.updateAllRows(tableName, "processingVersion", str(self.skychunk.processingVersion))
    521521    '''
    522522    Populates the SkinnyObject table for this OTA
    … …  
    545545        self.scratchDb.execute(sql)
    546546
    547         self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.skychunk.dataRelease))
     547        self.scratchDb.updateAllRows(tableName, "processingVersion", str(self.skychunk.processingVersion))
    548548
    549549    '''

  • trunk/ippToPsps/jython/diffbatch.py

    r38761 r38763  
    185185       
    186186
    187        self.dataRelease = skychunk.dataRelease;
     187       self.processingVersion = skychunk.processingVersion;
    188188       
    189189
    … …  
    236236        self.scratchDb.updateAllRows("DiffMeta_"+str(num), "surveyID", str(self.surveyID))
    237237        self.scratchDb.updateFilterID("DiffMeta_"+str(num), self.filterName[num][0])
    238         self.scratchDb.updateAllRows("DiffMeta_"+str(num), "dataRelease", str(self.skychunk.dataRelease))
     238        self.scratchDb.updateAllRows("DiffMeta_"+str(num), "processingVersion", str(self.skychunk.processingVersion))
    239239        self.logger.infoPair("DiffMeta_"+str(num),"done")
    240240
    … …  
    339339        sqlLine.group("DinfoFlag",        "FLAGS")                         
    340340        sqlLine.group("DinfoFlag2",       "FLAGS2")                         
    341         sqlLine.group("dataRelease",     str(self.skychunk.dataRelease))                 
     341        sqlLine.group("processingVersion",     str(self.skychunk.processingVersion))                 
    342342
    343343        sql = sqlLine.makeRaw(") SELECT ", " FROM " + ippTableName)

  • trunk/ippToPsps/jython/diffobjectbatch.py

    r38723 r38763  
    292292        sqlLine.group("dvoRegionID",     "CAT_ID")
    293293#        sqlLine.group("skycellID",       "SKYCELL_ID")
    294         sqlLine.group("dataRelease",     "'" + str(self.skychunk.dataRelease) + "'")
     294        sqlLine.group("processingVersion",     "'" + str(self.skychunk.processingVersion) + "'")
    295295        sqlLine.group("objInfoFlag",     "FLAGS")
    296296        sqlLine.group("qualityFlag",     "FLAGS >> 24 & 0xFF")

  • trunk/ippToPsps/jython/forcedobjectbatch.py

    r38736 r38763  
    334334        sqlLine.group("randomForcedObjID",        "RAND("+str(self.batchID)+")")
    335335        sqlLine.group("nDetections",      "'0'")
     336        sqlLine.group("processingVersion",   str(self.skychunk.processingVersion))
    336337        sql = sqlLine.makeRaw(") SELECT ", " FROM " + cptTableName)
    337338
    … …  
    363364        sqlLine.group("batchID",         "batchID")
    364365        sqlLine.group("nDetections",      "nDetections")
     366        sqlLine.group("processingVersion",   str(self.skychunk.processingVersion))
    365367
    366368        sql = sqlLine.makeRaw(") SELECT ", " FROM ForcedMeanObject")

  • trunk/ippToPsps/jython/forcedwarpbatch.py

    r38759 r38763  
    279279#        self.scratchDb.updateFilterID("ForcedWarpMeta", self.filterID)
    280280        self.scratchDb.updateFilterID("ForcedWarpMeta_"+forcedWarpID,self.filterName[num][0])
    281         self.scratchDb.updateAllRows("ForcedWarpMeta_"+forcedWarpID, "dataRelease", str(self.skychunk.dataRelease))
     281        self.scratchDb.updateAllRows("ForcedWarpMeta_"+forcedWarpID, "processingVersion", str(self.skychunk.processingVersion))
    282282        #self.tablesToExport.append("ForcedWarpMeta")
    283283       
    … …  
    379379        sqlLine.group("FinfoFlag","FLAGS")
    380380        sqlLine.group("FinfoFlag2","FLAGS2")
    381         sqlLine.group("dataRelease",str(self.skychunk.dataRelease))
     381        sqlLine.group("processingVersion",str(self.skychunk.processingVersion))
    382382
    383383        print "got here too"
    … …  
    393393
    394394
    395         # insert the per-object data (IDs, random stack ID, dataRelease, etc)
     395        # insert the per-object data (IDs, random stack ID, processingVersion, etc)
    396396        #self.selectDvoObjIDs()
    397397        self.logger.infoPair("inserting dvo info: find imageID","from externID")

  • trunk/ippToPsps/jython/ipptopspsdb.py

    r37917 r38763  
    11471147
    11481148        self.skychunk.basePath = rs.getString(11)
    1149         self.skychunk.dataRelease = rs.getInt(12)
     1149        self.skychunk.processingVersion = rs.getInt(12)
    11501150
    11511151        self.skychunk.deleteLocal = rs.getInt(13)

  • trunk/ippToPsps/jython/objectbatch.py

    r38723 r38763  
    370370        sqlLine.group("projectionID",    "PROJECTION_ID")
    371371        sqlLine.group("skycellID",       "SKYCELL_ID")
    372         sqlLine.group("dataRelease",     "'" + str(self.skychunk.dataRelease) + "'")
     372        sqlLine.group("processingVersion",     "'" + str(self.skychunk.processingVersion) + "'")
    373373        sqlLine.group("objInfoFlag",     "FLAGS")
    374374        sqlLine.group("qualityFlag",     "FLAGS >> 24 & 0xFF")

  • trunk/ippToPsps/jython/skychunk.py

    r35417 r38763  
    5555            self.logger.infoPair("Publishing to PSPS as survey", self.pspsSurvey)
    5656            self.logger.infoPair("Loading epoch", self.epoch)
    57             self.logger.infoPair("Data release", "%d" % self.dataRelease)
     57            self.logger.infoPair("Processing Version (aka, PV3 = 3, SAS39 = 39)", "%d" % self.processingVersion)
    5858            for batchType in self.batchTypes: self.logger.infoPair("Queuing batch type", batchType)
    5959        except:

  • trunk/ippToPsps/jython/stackbatch.py

    r38602 r38763  
    252252        sqlLine.group("skyCellID",     str(self.skycellID))           
    253253        sqlLine.group("photoCalID",    photoCalID)
    254         sqlLine.group("analysisVer",   str(self.analysisVer))
     254        sqlLine.group("analysisVer",   str(self.analysisVer))
     255        sqlLine.group("completMag",       self.getKeyFloat(header, "%.8f", 'FLIMIT'))
    255256        sqlLine.group("expTime",       self.getKeyFloat(header, "%.5f", 'EXPTIME')) 
    256257        sqlLine.group("psfModelID",    psfmodel)           
    … …  
    270271        sqlLine.group("pc002001",      self.getKeyFloat(header, "%.8e", 'PC002001'))
    271272        sqlLine.group("pc002002",      self.getKeyFloat(header, "%.8e", 'PC002002'))
    272         sqlLine.group("dataRelease",   str(self.skychunk.dataRelease))
     273        sqlLine.group("processingVersion",   str(self.skychunk.processingVersion))
    273274
    274275        sql = sqlLine.make(") VALUES ( ", ")")
    … …  
    288289        self.logger.infoPair("Procesing table", "StackObjectThin")
    289290
    290         # insert the per-object data (IDs, random stack ID, dataRelease, etc)
     291        # insert the per-object data (IDs, random stack ID, processingVersion, etc)
    291292        self.selectDvoObjIDs()
    292293
    … …  
    363364#            sqlLine.group("a."+filter+"skyErr",        "b.SKY_SIGMA / " + str(exptime))
    364365            sqlLine.group("a."+filter+"infoFlag",      "b.FLAGS")
    365             sqlLine.group("a."+filter+"infoFlag2",     "b.FLAGS2 | a."+filter+"infoFlag2")
     366            sqlLine.group("a."+filter+"infoFlag2",     "b.FLAGS2")
    366367            sqlLine.group("a."+filter+"nFrames",       "b.N_FRAMES")
    367368
    … …  
    10661067    '''
    10671068    select objID (psps object ID) from dvo restricted to this set of imageIDs. also insert
    1068     ippObjID and several constants (for a skycell): surveyID, skyCellId, dataRelease
     1069    ippObjID and several constants (for a skycell): surveyID, skyCellId, processingVersion
    10691070    '''
    10701071    def selectDvoObjIDs(self):
    … …  
    10851086 #       sqlLine.group("projectionID",     "'" + str(self.projectionID) + "'")
    10861087 #       sqlLine.group("skyCellID",        "'" + str(self.skycellID) + "'")
    1087  #       sqlLine.group("dataRelease",      "'" + str(self.skychunk.dataRelease) + "'")
     1088 #       sqlLine.group("processingVersion",      "'" + str(self.skychunk.processingVersion) + "'")
    10881089   #     sqlLine.group("randomStackObjID", "FLOOR(RAND()*9223372036854775807)")
    10891090
    … …  
    11221123              , projectionID = '" + str(self.projectionID) + "'\
    11231124              , skycellID = '" + str(self.skycellID) + "'\
    1124               , dataRelease = '" + str(self.skychunk.dataRelease)  +"'"
     1125              , processingVersion = '" + str(self.skychunk.processingVersion)  +"'"
    11251126             
    11261127        try: self.scratchDb.execute(sql)
Note: See TracChangeset for help on using the changeset viewer.