IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 36715


Ignore:
Timestamp:
May 1, 2014, 1:24:00 PM (12 years ago)
Author:
heather
Message:

found typos in vo tables

Location:
trunk/ippToPsps
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r36698 r36715  
    1818        <DESCRIPTION>filter identifier</DESCRIPTION>
    1919      </FIELD>
    20       <FIELD name="cameraID" arraysize="1" datatype="short" unit="dimensionless" default="NA">                             
     20      <FIELD name="cameraID" arraysize="1" datatype="short" unit="dimensionless" default="NA">                         
    2121        <DESCRIPTION>camera identifier</DESCRIPTION>
    2222      </FIELD>

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

    r36698 r36715  
    41614161        <DESCRIPTION>estimated filling factor at R10</DESCRIPTION>
    41624162      </FIELD>
    4163         <TABLEDATA></TABLEDATA>
     4163      <DATA>
     4164        <TABLEDATA></TABLEDATA>
    41644165      </DATA>
    41654166    </TABLE>

  • trunk/ippToPsps/jython/gpc1db.py

    r36714 r36715  
    398398
    399399        # print "staring stack stage cmf"
    400 
     400        #self.logger.infoPair("in stackstagecmf - sql is: ", sql)
    401401        # get single path base for the directory containing all cmf files, one of which is hopefully for our stack_id
    402402        try:
    … …  
    524524               AND filter = '" + filter + "' \
    525525               AND sky_id = %d" % skyID
    526              
    527         try:
    528             rs = self.executeQuery(sql)
    529             rs.first()
    530             return rs.getInt()
    531              
     526
     527#        self.logger.infoPair("sql",sql)
     528
     529        try:
     530            rs = self.executeQuery(sql)
     531                        
    532532        except:   
    533533            self.logger.exception("can't query for stackid in DVO")
    534534            self.logger.infoPair("failed sql:", sql)
    535             return -999
    536 
    537         return 0
     535            return 0
     536
     537        rs.first()
     538        try:
     539            stackid = rs.getInt(1)
     540            self.logger.infoPair("found stack_ID", stackid)
     541        except:
     542            stackid = -999
     543            self.logger.infoPair("using stack_ID",stackid)
     544           
     545        return stackid   

  • trunk/ippToPsps/jython/stackbatch.py

    r36712 r36715  
    5757       # self.printline = 0
    5858       # # self.testprint()
    59        self.logger.infoPair("did I get", "here");
     59#       self.logger.infoPair("did I get", "here");
    6060       self.stackType = "DEEP_STACK" # TODO
    6161       ## = stuff I commented out for pv2 stacks
    … …  
    6565       # get a list of stackIDs
    6666       self.logger.infoPair ("getting stackID for: ","g.00000")
    67        self.gstackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "g.00000")
     67       gstackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "g.00000")
    6868       self.logger.infoPair ("getting stackID for: ","r.00000")
    69        self.rstackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "r.00000")
     69       rstackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "r.00000")
    7070       self.logger.infoPair ("getting stackID for: ","i.00000")
    71        self.istackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "i.00000")
     71       istackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "i.00000")
    7272       self.logger.infoPair ("getting stackID for: ","z.00000")
    73        self.zstackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "z.00000")
     73       zstackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "z.00000")
    7474       self.logger.infoPair ("getting stackID for: ","y.00000")
    75        self.ystackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "y.00000")
    76  
     75       ystackID = gpc1Db.getStackIDFromSkyIDAndFilter( skychunk.dvoLabel, skyID, "y.00000")
     76 #      self.logger.infoPair("g stackID ",gstackID)       
     77 #      self.logger.infoPair("r stackID ",rstackID)
     78 #      self.logger.infoPair("i stackID ",istackID)
     79 #      self.logger.infoPair("z stackID ",zstackID)
     80 #      self.logger.infoPair("y stackID ",ystackID)
     81 #      raise
    7782       # from each stackget fits name from getStackStageCmf
    78        self.logger.infoPair ("finding fits file for: ","g.00000")
    79        self.gfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, gstackID)
    80        self.logger.infoPair ("finding fits file for: ","r.00000")
    81        self.rfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, rstackID)
    82        self.logger.infoPair ("finding fits file for: ","i.00000")
    83        self.ifits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, istackID)
    84        self.logger.infoPair ("finding fits file for: ","z.00000")
    85        self.zfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, zstackID)
    86        self.logger.infoPair ("finding fits file for: ","y.00000")
    87        self.yfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, ystackID)
     83       if gstackID > 0:
     84           self.logger.infoPair ("finding fits file for: ","g.00000")
     85           gfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, gstackID)
     86       if rstackID > 0:   
     87           self.logger.infoPair ("finding fits file for: ","r.00000")
     88           rfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, rstackID)
     89       if istackID > 0:   
     90           self.logger.infoPair ("finding fits file for: ","i.00000")
     91           ifits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, istackID)
     92       if zstackID > 0:   
     93           self.logger.infoPair ("finding fits file for: ","z.00000")
     94           zfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, zstackID)
     95       if ystackID > 0:   
     96           self.logger.infoPair ("finding fits file for: ","y.00000")
     97           yfits = gpc1Db.getStackStageCmf(skychunk.dvoLabel, ystackID)
    8898
    8999       #from each of those get self.gheader, self.rheader, etc.
    90 
    91        if self.gfits:
    92            self.gheader = self.gfits.getPrimaryHeader()
    93        if not self.gheader:
    94            self.logger.errorPair("could not read FITS PHU for ",gstackID)
     100       if gstackID > 0:   
     101           if gfits:
     102               gheader = gfits.getPrimaryHeader()
     103               if not gheader:
     104                   self.logger.errorPair("could not read FITS PHU for ",gstackID)
     105                   raise
     106       if rstackID > 0:       
     107           if rfits:
     108               rheader = rfits.getPrimaryHeader()
     109               if not rheader:
     110                   self.logger.errorPair("could not read FITS PHU for ",rstackID)
     111                   raise
     112       if istackID > 0:       
     113           if ifits:
     114               iheader = ifits.getPrimaryHeader()
     115               if not iheader:
     116                   self.logger.errorPair("could not read FITS PHU for ",istackID)
     117                   raise
     118       if zstackID > 0:
     119           if zfits:
     120               zheader = zfits.getPrimaryHeader()
     121               if not zheader:
     122                   self.logger.errorPair("could not read FITS PHU for ",zstackID)
     123                   raise
     124       if ystackID > 0:
     125           if yfits:
     126               yheader = yfits.getPrimaryHeader()
     127               if not yheader:
     128                   self.logger.errorPair("could not read FITS PHU for ",ystackID)
     129                   raise
     130
     131       # get stack meta data
     132       metastackid = -999
     133       if gstackID > 0:
     134           metastackid = gstackID
     135       if rstackID > 0:
     136           metastackid = rstackID
     137       if istackID > 0:
     138           metastackid = istackID   
     139       if zstackID > 0:
     140           metastackid = zstackID
     141       if ystackID > 0:
     142           metastackid = ystackID
     143       #there is probably a better way to do this
     144       if metastackid < 0:
     145           self.logger.errorPair("can't find any stack ids...?? ","??")
    95146           raise
    96 
    97        if self.rfits:
    98            self.rheader = self.rfits.getPrimaryHeader()
    99        if not self.rheader:
    100            self.logger.errorPair("could not read FITS PHU for ",rstackID)
    101            raise
    102 
    103        if self.ifits:
    104            self.iheader = self.ifits.getPrimaryHeader()
    105        if not self.iheader:
    106            self.logger.errorPair("could not read FITS PHU for ",istackID)
    107            raise
    108 
    109        if self.zfits:
    110            self.zheader = self.zfits.getPrimaryHeader()
    111        if not self.zheader:
    112            self.logger.errorPair("could not read FITS PHU for ",zstackID)
    113            raise
    114 
    115        if self.yfits:
    116            self.yheader = self.yfits.getPrimaryHeader()
    117        if not self.yheader:
    118            self.logger.errorPair("could not read FITS PHU for ",ystackID)
    119            raise
    120 
    121        # get stack meta data
    122        meta = self.gpc1Db.getStackStageMeta(self.gstackID) 
     147   
     148       meta = self.gpc1Db.getStackStageMeta(metastackid) 
    123149       ## this should be ok - it takes a stack_id and returns filter/skycell etc.
    124150
    … …  
    128154           raise
    129155
    130        ##self.filter = meta[0];
    131        ##self.filter = self.filter[0:1]
    132        ##self.filterID = self.scratchDb.getFilterID(self.filter)
     156       #self.filter = meta[0];
     157       #self.filter = self.filter[0:1]
     158       #self.filterID = self.scratchDb.getFilterID(self.filter)
    133159       self.skycell = meta[1];
    134160
    … …  
    138164       # we need 1133.081 for skycell, but store as an int, so instead store 1133081
    139165       # projection cell is just the 1133 bit
    140        # this is how it should be done
     166       # This Is how it should be done
    141167       #self.projectioncell = self.skycell[8:12]
    142168       #self.skycell = self.skycell[8:]
    … …  
    205231
    206232       # insert what we know about this stack batch into the stack table
    207        self.ippToPspsDb.insertStackMeta(self.batchID, "grizy" , self.stackType)
     233       self.ippToPspsDb.insertStackMeta(self.batchID, "x" , self.stackType)
    208234
    209235       # insert sourceID/imageID combo so DVO can look it up
Note: See TracChangeset for help on using the changeset viewer.