IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 4, 2014, 4:48:50 PM (12 years ago)
Author:
eugene
Message:

rename stack tables for consistency and clariy

Location:
branches/eam_branches/ipp-20140717/ippToPsps
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140717/ippToPsps/config/tables.ST.vot

    r37180 r37186  
    464464    </TABLE>
    465465
    466     <!-- StackObjecExtra Table ************************************************** -->
    467     <TABLE name="StackObjectExtra">
     466    <!-- StackObjectRaw Table ************************************************** -->
     467    <TABLE name="StackObjectRaw">
    468468      <DESCRIPTION>VOTable description of PSPS table StackObject</DESCRIPTION>
    469469      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
    … …  
    15891589    </TABLE>
    15901590
    1591     <!-- StackModelFitThin Table ************************************************** -->
    1592     <TABLE name="StackModelFitThin">
    1593       <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
     1591    <!-- StackModelFitExtra Table ************************************************** -->
     1592    <TABLE name="StackModelFitExtra">
     1593      <DESCRIPTION>VOTable description of PSPS table StackModelFitExtra</DESCRIPTION>
    15941594      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
    15951595      <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    … …  
    17791779    <!-- StackModelFitExp Table ************************************************** -->
    17801780    <TABLE name="StackModelFitExp">
    1781       <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
     1781      <DESCRIPTION>VOTable description of PSPS table StackModelFitExp</DESCRIPTION>
    17821782      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
    17831783      <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    … …  
    20722072    <!-- StackModelFitDeV Table ************************************************** -->
    20732073    <TABLE name="StackModelFitDeV">
    2074       <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
     2074      <DESCRIPTION>VOTable description of PSPS table StackModelFitDeV</DESCRIPTION>
    20752075      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
    20762076      <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    … …  
    23652365    <!-- StackModelFitSer Table ************************************************** -->
    23662366    <TABLE name="StackModelFitSer">
    2367       <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
     2367      <DESCRIPTION>VOTable description of PSPS table StackModelFitSer</DESCRIPTION>
    23682368      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
    23692369      <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    … …  
    26862686    </TABLE>
    26872687
    2688     <!-- StackModelFitFlx Table ************************************************** -->
    2689     <TABLE name="StackModelFitFlx">
    2690       <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
     2688    <!-- StackApFlxFull Table ************************************************** -->
     2689    <TABLE name="StackApFlxFull">
     2690      <DESCRIPTION>VOTable description of PSPS table StackApFlxFull</DESCRIPTION>
    26912691      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
    26922692      <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    … …  
    33693369    </TABLE>
    33703370
    3371     <!-- StackModelFitFlxC1 Table ************************************************** -->
    3372     <TABLE name="StackModelFitFlxC1">
    3373       <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
     3371    <!-- StackApFlxFullC1 Table ************************************************** -->
     3372    <TABLE name="StackApFlxFullC1">
     3373      <DESCRIPTION>VOTable description of PSPS table StackApFlxFullC1</DESCRIPTION>
    33743374      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
    33753375      <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    … …  
    40524052    </TABLE>
    40534053
    4054     <!-- StackModelFitFlxC2 Table ************************************************** -->
    4055     <TABLE name="StackModelFitFlxC2">
    4056       <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
     4054    <!-- StackApFlxFullC2 Table ************************************************** -->
     4055    <TABLE name="StackApFlxFullC2">
     4056      <DESCRIPTION>VOTable description of PSPS table StackApFlxFullC2</DESCRIPTION>
    40574057      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
    40584058      <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    … …  
    47354735    </TABLE>
    47364736
    4737     <!-- StackModelFitPet Table ************************************************** -->
    4738     <TABLE name="StackModelFitPet">
    4739       <DESCRIPTION>VOTable description of PSPS table StackModelFit</DESCRIPTION>
     4737    <!-- StackPetrosian Table ************************************************** -->
     4738    <TABLE name="StackPetrosian">
     4739      <DESCRIPTION>VOTable description of PSPS table StackPetrosian</DESCRIPTION>
    47404740      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
    47414741      <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">

  • branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py

    r37179 r37186  
    157157
    158158       self.dropTableVerbose("StackObjectThin")
    159        self.dropTableVerbose("StackObjectExtra")
     159       self.dropTableVerbose("StackObjectRaw")
    160160       
    161        self.dropTableVerbose("StackApFlx")
    162        
    163        self.dropTableVerbose("StackModelFitThin")
     161       self.dropTableVerbose("StackModelFitExtra")
    164162       self.dropTableVerbose("StackModelFitDeV")
    165163       self.dropTableVerbose("StackModelFitExp")
    166164       self.dropTableVerbose("StackModelFitSer")
    167        self.dropTableVerbose("StackModelFitPet")
    168        self.dropTableVerbose("StackModelFitFlx")
    169        self.dropTableVerbose("StackModelFitFlxC1")
    170        self.dropTableVerbose("StackModelFitFlxC2")
     165
     166       self.dropTableVerbose("StackApFlx")
     167       self.dropTableVerbose("StackApFlxFull")
     168       self.dropTableVerbose("StackApFlxFullC1")
     169       self.dropTableVerbose("StackApFlxFullC2")
     170
     171       self.dropTableVerbose("StackPetrosian")
    171172
    172173       self.dropTableVerbose("StackToImage")
    … …  
    370371
    371372    '''
    372     Populates the StackObjectExtra table
    373     '''
    374     def populateStackObjectExtra(self):
    375 
    376         tablename = "StackObjectExtra"
     373    Populates the StackObjectRaw table
     374    '''
     375    def populateStackObjectRaw(self):
     376
     377        tablename = "StackObjectRaw"
    377378
    378379        self.logger.infoPair("Procesing table", tablename)
    … …  
    380381
    381382        # if we are going to add a key, do it here so it is useful
    382         # self.scratchDb.createIndex("StackObjectExtra", "objID")
     383        # self.scratchDb.createIndex(tablename, "objID")
    383384
    384385        self.logger.infoPair("inserting filter dependent cmf items into", tablename)
    … …  
    462463
    463464    '''
    464     Populates the StackModelFitThin table
    465     '''
    466     def populateStackModelFitThin(self):
    467 
    468         self.logger.infoPair("Procesing table", "StackModelFitThin")
    469         self.insertDvoIDs("StackModelFitThin", "StackObjectThin")
     465    Populates the StackModelFitExtra table
     466    '''
     467    def populateStackModelFitExtra(self):
     468
     469        self.logger.infoPair("Procesing table", "StackModelFitExtra")
     470        self.insertDvoIDs("StackModelFitExtra", "StackObjectThin")
    470471
    471472        # if we are going to add a key, do it here so it is useful
    472         # self.scratchDb.createIndex("StackObjectExtra", "objID")
     473        # self.scratchDb.createIndex(tablename, "objID")
    473474
    474475        # currently, none of the fields defined by the table are generated
    … …  
    560561
    561562    '''
    562     Populates the StackModelFitPet table, mainly from dictionary values found in IPP FITS header
     563    Populates the StackPetrosian table, mainly from dictionary values found in IPP FITS header
    563564    '''
    564565    def populateStackPetrosian(self):
    565566
    566         tablename = "StackModelFitPet"
     567        tablename = "StackPetrosian"
    567568
    568569        self.logger.infoPair("Procesing table", tablename)
    … …  
    579580
    580581    '''
    581     Populates the StackModelFitPet table, mainly from dictionary values found in IPP FITS header
     582    Populates the StackPetrosian table, mainly from dictionary values found in IPP FITS header
    582583    '''
    583584    def populateStackPetrosianFilter(self, filter):
    … …  
    588589
    589590        self.logger.infoPair("Adding", "petrosians for extended sources")
    590         sqlLine = sqlUtility("UPDATE StackModelFitPet AS a, " + filter + "SkyChip_xsrc AS b SET")
     591        sqlLine = sqlUtility("UPDATE StackPetrosian AS a, " + filter + "SkyChip_xsrc AS b SET")
    591592
    592593        sqlLine.group("a."+filter+"haveData",         "'1'")
    … …  
    610611    Populates the StackApFlx table
    611612    '''
    612     def populateStackApFlxThin(self):
     613    def populateStackApFlx(self):
    613614
    614615        tablename = "StackApFlx"
    … …  
    629630
    630631    '''
    631     Populates the StackApFlx table
    632     '''
    633     def populateStackApFlx(self, version):
    634 
    635         tablename = "StackModelFitFlx" + version
     632    Populates the StackApFlxFull table
     633    '''
     634    def populateStackApFlxFull(self, version):
     635
     636        tablename = "StackApFlxFull" + version
    636637
    637638        self.logger.infoPair("Procesing table", tablename)
    … …  
    965966        self.populateStackObjectThin()
    966967
    967         self.populateStackObjectExtra()
     968        self.populateStackObjectRaw()
    968969
    969970        if self.stackType != "NIGHTLY_STACK":
    970971
    971             self.logger.infoPair("populating ","StackModelFitThin")
    972             self.populateStackModelFitThin()
     972            self.logger.infoPair("populating ","StackModelFitExtra")
     973            self.populateStackModelFitExtra()
    973974
    974975            self.logger.infoPair("populating ","StackModelFit")
    … …  
    980981
    981982            self.logger.infoPair("populating ","StackApFlx Tables")
    982             self.populateStackApFlxThin()
    983 
    984             self.populateStackApFlx("")
    985             self.populateStackApFlx("C1")
    986             self.populateStackApFlx("C2")
     983            self.populateStackApFlx()
     984
     985            self.populateStackApFlxFull("")
     986            self.populateStackApFlxFull("C1")
     987            self.populateStackApFlxFull("C2")
    987988
    988989        # delete rows with no content. for the other tables, this is done in
Note: See TracChangeset for help on using the changeset viewer.