IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 13, 2015, 5:50:46 AM (11 years ago)
Author:
eugene
Message:

merged changes from trunk

Location:
branches/eam_branches/ipp-20151113
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20151113

  • branches/eam_branches/ipp-20151113/ippToPsps/config/tables.DO.vot

    r39032 r39266  
    66      <DESCRIPTION>Contains the positional information for difference detection objects in a number of coordinate systems.  The objects associate difference detections within a one arcsecond radius.  The number of detections in each filter from is listed, along with maximum coverage fractions.  References: Szalay, A. S., Gray, J., Fekete, G., et al. 2007, arXiv:cs/0701164.</DESCRIPTION>
    77      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
    8       <FIELD name="diffObjName" arraysize="100" datatype="char" unit="dimensionless" default="NA">
     8      <FIELD name="diffObjName" arraysize="32" datatype="char" unit="dimensionless" default="NA">
    99        <DESCRIPTION>IAU name for this object.</DESCRIPTION>
    1010      </FIELD>
    11       <FIELD name="diffObjAltName1" arraysize="100" datatype="char" unit="dimensionless" default="NA">
     11      <FIELD name="diffObjPSOName" arraysize="32" datatype="char" unit="dimensionless" default="NA">
    1212        <DESCRIPTION>Alternate Pan-STARRS name for this object.</DESCRIPTION>
    1313      </FIELD>
    14       <FIELD name="diffObjAltName2" arraysize="100" datatype="char" unit="dimensionless" default="">
     14      <FIELD name="diffObjAltName1" arraysize="32" datatype="char" unit="dimensionless" default="">
    1515        <DESCRIPTION>Altername name for this object.</DESCRIPTION>
    1616      </FIELD>
    17       <FIELD name="diffObjAltName3" arraysize="100" datatype="char" unit="dimensionless" default="">
     17      <FIELD name="diffObjAltName2" arraysize="32" datatype="char" unit="dimensionless" default="">
    1818        <DESCRIPTION>Altername name for this object.</DESCRIPTION>
     19      </FIELD>
     20      <FIELD name="diffObjAltName3" arraysize="32" datatype="char" unit="dimensionless" default="">
     21        <DESCRIPTION>Altername name for this object.</DESCRIPTION>
     22      </FIELD>
     23      <FIELD name="diffObjPopularName" arraysize="140" datatype="char" unit="dimensionless" default="">
     24        <DESCRIPTION>Well known name for this object.</DESCRIPTION>
    1925      </FIELD>
    2026      <FIELD name="diffObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">

  • branches/eam_branches/ipp-20151113/ippToPsps/config/tables.FO.vot

    r39088 r39266  
    5858        <DESCRIPTION>Standard deviation of PSF fluxes from forced single epoch g filter detections.</DESCRIPTION>
    5959      </FIELD>
     60      <FIELD name="gFPSFMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     61        <DESCRIPTION>Magnitude from mean PSF flux from forced single epoch g filter detections.</DESCRIPTION>
     62      </FIELD>
     63      <FIELD name="gFPSFMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     64        <DESCRIPTION>Error in magnitude from mean PSF flux from forced single epoch g filter detections.</DESCRIPTION>
     65      </FIELD>
    6066      <FIELD name="gFKronFlux" arraysize="1" datatype="float" unit="Janskys" default="-999">
    6167        <DESCRIPTION>Mean Kron (1980) flux from forced single epoch g filter detections.</DESCRIPTION>
    … …  
    6773        <DESCRIPTION>Standard deviation of Kron (198) fluxes from forced single epoch g filter detections.</DESCRIPTION>
    6874      </FIELD>
     75      <FIELD name="gFKronMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     76        <DESCRIPTION>Magnitude from mean Kron (1980) flux from forced single epoch g filter detections.</DESCRIPTION>
     77      </FIELD>
     78      <FIELD name="gFKronMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     79        <DESCRIPTION>Error in magnitude from mean Kron (1980) flux from forced single epoch g filter detections.</DESCRIPTION>
     80      </FIELD>
    6981      <FIELD name="gFApFlux" arraysize="1" datatype="float" unit="Janskys" default="-999">
    7082        <DESCRIPTION>Mean aperture flux from forced single epoch g filter detections.</DESCRIPTION>
    … …  
    7688        <DESCRIPTION>Standard deviation of aperture fluxes from forced single epoch g filter detections.</DESCRIPTION>
    7789      </FIELD>
     90      <FIELD name="gFApMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     91        <DESCRIPTION>Magnitude from mean aperture flux from forced single epoch g filter detections.</DESCRIPTION>
     92      </FIELD>
     93      <FIELD name="gFApMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     94        <DESCRIPTION>Error in magnitude from mean aperture flux from forced single epoch g filter detections.</DESCRIPTION>
     95      </FIELD>
    7896      <FIELD name="gFmeanflxR5" arraysize="1" datatype="float" unit="Janskys" default="-999">
    7997        <DESCRIPTION>Mean flux from forced single epoch g filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
    … …  
    88106        <DESCRIPTION>Aperture fill factor for forced single epoch g filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
    89107      </FIELD>
     108      <FIELD name="gFmeanMagR5" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     109        <DESCRIPTION>Magnitude from mean flux from forced single epoch g filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
     110      </FIELD>
     111      <FIELD name="gFmeanMagR5Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     112        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch g filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
     113      </FIELD>
    90114      <FIELD name="gFmeanflxR6" arraysize="1" datatype="float" unit="Janskys" default="-999">
    91115        <DESCRIPTION>Mean flux from forced single epoch g filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
    … …  
    100124        <DESCRIPTION>Aperture fill factor for forced single epoch g filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
    101125      </FIELD>
     126      <FIELD name="gFmeanMagR6" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     127        <DESCRIPTION>Magnitude from mean flux from forced single epoch g filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
     128      </FIELD>
     129      <FIELD name="gFmeanMagR6Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     130        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch g filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
     131      </FIELD>
    102132      <FIELD name="gFmeanflxR7" arraysize="1" datatype="float" unit="Janskys" default="-999">
    103133        <DESCRIPTION>Mean flux from forced single epoch g filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
    … …  
    111141      <FIELD name="gFmeanflxR7Fill" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    112142        <DESCRIPTION>Aperture fill factor for forced single epoch g filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
    113       </FIELD>     
     143      </FIELD>
     144      <FIELD name="gFmeanMagR7" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     145        <DESCRIPTION>Magnitude from mean flux from forced single epoch g filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
     146      </FIELD>
     147      <FIELD name="gFmeanMagR7Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     148        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch g filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
     149      </FIELD>
    114150      <FIELD name="gFlags" arraysize="1" datatype="int" unit="dimensionless" default="0">
    115151        <DESCRIPTION>Information flag bitmask indicating details of the photometry from forced single epoch g filter detections.  Values listed in ObjectInfoFlags.</DESCRIPTION>
    … …  
    152188        <DESCRIPTION>Standard deviation of PSF fluxes from forced single epoch r filter detections.</DESCRIPTION>
    153189      </FIELD>
     190      <FIELD name="rFPSFMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     191        <DESCRIPTION>Magnitude from mean PSF flux from forced single epoch r filter detections.</DESCRIPTION>
     192      </FIELD>
     193      <FIELD name="rFPSFMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     194        <DESCRIPTION>Error in magnitude from mean PSF flux from forced single epoch r filter detections.</DESCRIPTION>
     195      </FIELD>
    154196      <FIELD name="rFKronFlux" arraysize="1" datatype="float" unit="Janskys" default="-999">
    155197        <DESCRIPTION>Mean Kron (1980) flux from forced single epoch r filter detections.</DESCRIPTION>
    … …  
    161203        <DESCRIPTION>Standard deviation of Kron (198) fluxes from forced single epoch r filter detections.</DESCRIPTION>
    162204      </FIELD>
     205      <FIELD name="rFKronMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     206        <DESCRIPTION>Magnitude from mean Kron (1980) flux from forced single epoch r filter detections.</DESCRIPTION>
     207      </FIELD>
     208      <FIELD name="rFKronMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     209        <DESCRIPTION>Error in magnitude from mean Kron (1980) flux from forced single epoch r filter detections.</DESCRIPTION>
     210      </FIELD>
    163211      <FIELD name="rFApFlux" arraysize="1" datatype="float" unit="Janskys" default="-999">
    164212        <DESCRIPTION>Mean aperture flux from forced single epoch r filter detections.</DESCRIPTION>
    … …  
    170218        <DESCRIPTION>Standard deviation of aperture fluxes from forced single epoch g filter detections.</DESCRIPTION>
    171219      </FIELD>
     220      <FIELD name="rFApMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     221        <DESCRIPTION>Magnitude from mean aperture flux from forced single epoch r filter detections.</DESCRIPTION>
     222      </FIELD>
     223      <FIELD name="rFApMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     224        <DESCRIPTION>Error in magnitude from mean aperture flux from forced single epoch r filter detections.</DESCRIPTION>
     225      </FIELD>
    172226      <FIELD name="rFmeanflxR5" arraysize="1" datatype="float" unit="Janskys" default="-999">
    173227        <DESCRIPTION>Mean flux from forced single epoch r filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
    … …  
    182236        <DESCRIPTION>Aperture fill factor for forced single epoch r filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
    183237      </FIELD>
     238      <FIELD name="rFmeanMagR5" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     239        <DESCRIPTION>Magnitude from mean flux from forced single epoch r filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
     240      </FIELD>
     241      <FIELD name="rFmeanMagR5Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     242        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch r filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
     243      </FIELD>
    184244      <FIELD name="rFmeanflxR6" arraysize="1" datatype="float" unit="Janskys" default="-999">
    185245        <DESCRIPTION>Mean flux from forced single epoch r filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
    … …  
    194254        <DESCRIPTION>Aperture fill factor for forced single epoch r filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
    195255      </FIELD>
     256      <FIELD name="rFmeanMagR6" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     257        <DESCRIPTION>Magnitude from mean flux from forced single epoch r filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
     258      </FIELD>
     259      <FIELD name="rFmeanMagR6Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     260        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch r filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
     261      </FIELD>
    196262      <FIELD name="rFmeanflxR7" arraysize="1" datatype="float" unit="Janskys" default="-999">
    197263        <DESCRIPTION>Mean flux from forced single epoch r filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
    … …  
    205271      <FIELD name="rFmeanflxR7Fill" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    206272        <DESCRIPTION>Aperture fill factor for forced single epoch r filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
     273      </FIELD>
     274      <FIELD name="rFmeanMagR7" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     275        <DESCRIPTION>Magnitude from mean flux from forced single epoch r filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
     276      </FIELD>
     277      <FIELD name="rFmeanMagR7Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     278        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch r filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
    207279      </FIELD>
    208280      <FIELD name="rFlags" arraysize="1" datatype="int" unit="dimensionless" default="0">
    … …  
    246318        <DESCRIPTION>Standard deviation of PSF fluxes from forced single epoch i filter detections.</DESCRIPTION>
    247319      </FIELD>
     320      <FIELD name="iFPSFMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     321        <DESCRIPTION>Magnitude from mean PSF flux from forced single epoch i filter detections.</DESCRIPTION>
     322      </FIELD>
     323      <FIELD name="iFPSFMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     324        <DESCRIPTION>Error in magnitude from mean PSF flux from forced single epoch i filter detections.</DESCRIPTION>
     325      </FIELD>
    248326      <FIELD name="iFKronFlux" arraysize="1" datatype="float" unit="Janskys" default="-999">
    249327        <DESCRIPTION>Mean Kron (1980) flux from forced single epoch i filter detections.</DESCRIPTION>
    … …  
    255333        <DESCRIPTION>Standard deviation of Kron (198) fluxes from forced single epoch i filter detections.</DESCRIPTION>
    256334      </FIELD>
     335      <FIELD name="iFKronMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     336        <DESCRIPTION>Magnitude from mean Kron (1980) flux from forced single epoch i filter detections.</DESCRIPTION>
     337      </FIELD>
     338      <FIELD name="iFKronMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     339        <DESCRIPTION>Error in magnitude from mean Kron (1980) flux from forced single epoch i filter detections.</DESCRIPTION>
     340      </FIELD>
    257341      <FIELD name="iFApFlux" arraysize="1" datatype="float" unit="Janskys" default="-999">
    258342        <DESCRIPTION>Mean aperture flux from forced single epoch i filter detections.</DESCRIPTION>
    … …  
    264348        <DESCRIPTION>Standard deviation of aperture fluxes from forced single epoch i filter detections.</DESCRIPTION>
    265349      </FIELD>
     350      <FIELD name="iFApMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     351        <DESCRIPTION>Magnitude from mean aperture flux from forced single epoch i filter detections.</DESCRIPTION>
     352      </FIELD>
     353      <FIELD name="iFApMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     354        <DESCRIPTION>Error in magnitude from mean aperture flux from forced single epoch i filter detections.</DESCRIPTION>
     355      </FIELD>
    266356      <FIELD name="iFmeanflxR5" arraysize="1" datatype="float" unit="Janskys" default="-999">
    267357        <DESCRIPTION>Mean flux from forced single epoch i filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
    … …  
    276366        <DESCRIPTION>Aperture fill factor for forced single epoch i filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
    277367      </FIELD>
     368      <FIELD name="iFmeanMagR5" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     369        <DESCRIPTION>Magnitude from mean flux from forced single epoch i filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
     370      </FIELD>
     371      <FIELD name="iFmeanMagR5Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     372        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch i filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
     373      </FIELD>
    278374      <FIELD name="iFmeanflxR6" arraysize="1" datatype="float" unit="Janskys" default="-999">
    279375        <DESCRIPTION>Mean flux from forced single epoch i filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
    … …  
    288384        <DESCRIPTION>Aperture fill factor for forced single epoch i filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
    289385      </FIELD>
     386      <FIELD name="iFmeanMagR6" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     387        <DESCRIPTION>Magnitude from mean flux from forced single epoch i filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
     388      </FIELD>
     389      <FIELD name="iFmeanMagR6Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     390        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch i filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
     391      </FIELD>
    290392      <FIELD name="iFmeanflxR7" arraysize="1" datatype="float" unit="Janskys" default="-999">
    291393        <DESCRIPTION>Mean flux from forced single epoch i filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
    … …  
    300402        <DESCRIPTION>Aperture fill factor for forced single epoch i filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
    301403      </FIELD>
     404      <FIELD name="iFmeanMagR7" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     405        <DESCRIPTION>Magnitude from mean flux from forced single epoch i filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
     406      </FIELD>
     407      <FIELD name="iFmeanMagR7Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     408        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch i filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
     409      </FIELD>
    302410      <FIELD name="iFlags" arraysize="1" datatype="int" unit="dimensionless" default="0">
    303411        <DESCRIPTION>Information flag bitmask indicating details of the photometry from forced single epoch i filter detections.  Values listed in ObjectInfoFlags.</DESCRIPTION>
    … …  
    340448        <DESCRIPTION>Standard deviation of PSF fluxes from forced single epoch z filter detections.</DESCRIPTION>
    341449      </FIELD>
     450      <FIELD name="zFPSFMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     451        <DESCRIPTION>Magnitude from mean PSF flux from forced single epoch z filter detections.</DESCRIPTION>
     452      </FIELD>
     453      <FIELD name="zFPSFMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     454        <DESCRIPTION>Error in magnitude from mean PSF flux from forced single epoch z filter detections.</DESCRIPTION>
     455      </FIELD>
    342456      <FIELD name="zFKronFlux" arraysize="1" datatype="float" unit="Janskys" default="-999">
    343457        <DESCRIPTION>Mean Kron (1980) flux from forced single epoch z filter detections.</DESCRIPTION>
    … …  
    349463        <DESCRIPTION>Standard deviation of Kron (198) fluxes from forced single epoch z filter detections.</DESCRIPTION>
    350464      </FIELD>
     465      <FIELD name="zFKronMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     466        <DESCRIPTION>Magnitude from mean Kron (1980) flux from forced single epoch z filter detections.</DESCRIPTION>
     467      </FIELD>
     468      <FIELD name="zFKronMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     469        <DESCRIPTION>Error in magnitude from mean Kron (1980) flux from forced single epoch z filter detections.</DESCRIPTION>
     470      </FIELD>
    351471      <FIELD name="zFApFlux" arraysize="1" datatype="float" unit="Janskys" default="-999">
    352472        <DESCRIPTION>Mean aperture flux from forced single epoch z filter detections.</DESCRIPTION>
    … …  
    358478        <DESCRIPTION>Standard deviation of aperture fluxes from forced single epoch z filter detections.</DESCRIPTION>
    359479      </FIELD>
     480      <FIELD name="zFApMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     481        <DESCRIPTION>Magnitude from mean aperture flux from forced single epoch z filter detections.</DESCRIPTION>
     482      </FIELD>
     483      <FIELD name="zFApMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     484        <DESCRIPTION>Error in magnitude from mean aperture flux from forced single epoch z filter detections.</DESCRIPTION>
     485      </FIELD>
    360486      <FIELD name="zFmeanflxR5" arraysize="1" datatype="float" unit="Janskys" default="-999">
    361487        <DESCRIPTION>Mean flux from forced single epoch z filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
    … …  
    370496        <DESCRIPTION>Aperture fill factor for forced single epoch z filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
    371497      </FIELD>
     498      <FIELD name="zFmeanMagR5" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     499        <DESCRIPTION>Magnitude from mean flux from forced single epoch z filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
     500      </FIELD>
     501      <FIELD name="zFmeanMagR5Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     502        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch z filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
     503      </FIELD>
    372504      <FIELD name="zFmeanflxR6" arraysize="1" datatype="float" unit="Janskys" default="-999">
    373505        <DESCRIPTION>Mean flux from forced single epoch z filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
    … …  
    382514        <DESCRIPTION>Aperture fill factor for forced single epoch z filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
    383515      </FIELD>
     516      <FIELD name="zFmeanMagR6" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     517        <DESCRIPTION>Magnitude from mean flux from forced single epoch z filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
     518      </FIELD>
     519      <FIELD name="zFmeanMagR6Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     520        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch z filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
     521      </FIELD>
    384522      <FIELD name="zFmeanflxR7" arraysize="1" datatype="float" unit="Janskys" default="-999">
    385523        <DESCRIPTION>Mean flux from forced single epoch z filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
    … …  
    394532        <DESCRIPTION>Aperture fill factor for forced single epoch z filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
    395533      </FIELD>
     534      <FIELD name="zFmeanMagR7" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     535        <DESCRIPTION>Magnitude from mean flux from forced single epoch z filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
     536      </FIELD>
     537      <FIELD name="zFmeanMagR7Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     538        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch z filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
     539      </FIELD>
    396540      <FIELD name="zFlags" arraysize="1" datatype="int" unit="dimensionless" default="0">
    397541        <DESCRIPTION>Information flag bitmask indicating details of the photometry from forced single epoch z filter detections.  Values listed in ObjectInfoFlags.</DESCRIPTION>
    … …  
    434578        <DESCRIPTION>Standard deviation of PSF fluxes from forced single epoch y filter detections.</DESCRIPTION>
    435579      </FIELD>
     580      <FIELD name="yFPSFMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     581        <DESCRIPTION>Magnitude from mean PSF flux from forced single epoch y filter detections.</DESCRIPTION>
     582      </FIELD>
     583      <FIELD name="yFPSFMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     584        <DESCRIPTION>Error in magnitude from mean PSF flux from forced single epoch y filter detections.</DESCRIPTION>
     585      </FIELD>
    436586      <FIELD name="yFKronFlux" arraysize="1" datatype="float" unit="Janskys" default="-999">
    437587        <DESCRIPTION>Mean Kron (1980) flux from forced single epoch y filter detections.</DESCRIPTION>
    … …  
    443593        <DESCRIPTION>Standard deviation of Kron (198) fluxes from forced single epoch y filter detections.</DESCRIPTION>
    444594      </FIELD>
     595      <FIELD name="yFKronMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     596        <DESCRIPTION>Magnitude from mean Kron (1980) flux from forced single epoch y filter detections.</DESCRIPTION>
     597      </FIELD>
     598      <FIELD name="yFKronMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     599        <DESCRIPTION>Error in magnitude from mean Kron (1980) flux from forced single epoch y filter detections.</DESCRIPTION>
     600      </FIELD>
    445601      <FIELD name="yFApFlux" arraysize="1" datatype="float" unit="Janskys" default="-999">
    446602        <DESCRIPTION>Mean aperture flux from forced single epoch y filter detections.</DESCRIPTION>
    … …  
    452608        <DESCRIPTION>Standard deviation of aperture fluxes from forced single epoch y filter detections.</DESCRIPTION>
    453609      </FIELD>
     610      <FIELD name="yFApMag" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     611        <DESCRIPTION>Magnitude from mean aperture flux from forced single epoch y filter detections.</DESCRIPTION>
     612      </FIELD>
     613      <FIELD name="yFApMagErr" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     614        <DESCRIPTION>Error in magnitude from mean aperture flux from forced single epoch y filter detections.</DESCRIPTION>
     615      </FIELD>
    454616      <FIELD name="yFmeanflxR5" arraysize="1" datatype="float" unit="Janskys" default="-999">
    455617        <DESCRIPTION>Mean flux from forced single epoch y filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
    … …  
    464626        <DESCRIPTION>Aperture fill factor for forced single epoch y filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
    465627      </FIELD>
     628      <FIELD name="yFmeanMagR5" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     629        <DESCRIPTION>Magnitude from mean flux from forced single epoch y filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
     630      </FIELD>
     631      <FIELD name="yFmeanMagR5Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     632        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch y filter detections within an aperture of radius r = 3.00 arcsec.</DESCRIPTION>
     633      </FIELD>
    466634      <FIELD name="yFmeanflxR6" arraysize="1" datatype="float" unit="Janskys" default="-999">
    467635        <DESCRIPTION>Mean flux from forced single epoch y filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
    … …  
    476644        <DESCRIPTION>Aperture fill factor for forced single epoch y filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
    477645      </FIELD>
     646      <FIELD name="yFmeanMagR6" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     647        <DESCRIPTION>Magnitude from mean flux from forced single epoch y filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
     648      </FIELD>
     649      <FIELD name="yFmeanMagR6Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     650        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch y filter detections within an aperture of radius r = 4.63 arcsec.</DESCRIPTION>
     651      </FIELD>
    478652      <FIELD name="yFmeanflxR7" arraysize="1" datatype="float" unit="Janskys" default="-999">
    479653        <DESCRIPTION>Mean flux from forced single epoch y filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
    … …  
    487661      <FIELD name="yFmeanflxR7Fill" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    488662        <DESCRIPTION>Aperture fill factor for forced single epoch y filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
     663      </FIELD>
     664      <FIELD name="yFmeanMagR7" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     665        <DESCRIPTION>Magnitude from mean flux from forced single epoch y filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
     666      </FIELD>
     667      <FIELD name="yFmeanMagR7Err" arraysize="1" datatype="float" unit="AB magnitudes" default="-999">
     668        <DESCRIPTION>Error in magnitude from  mean flux from forced single epoch y filter detections within an aperture of radius r = 7.43 arcsec.</DESCRIPTION>
    489669      </FIELD>
    490670      <FIELD name="yFlags" arraysize="1" datatype="int" unit="dimensionless" default="0">

  • branches/eam_branches/ipp-20151113/ippToPsps/config/tables.OB.vot

    r39088 r39266  
    1111        <DESCRIPTION>IAU name for this object.</DESCRIPTION>
    1212      </FIELD>
    13       <FIELD name="objAltName1" arraysize="100" datatype="char" unit="dimensionless" default="NA">
     13      <FIELD name="objPSOName" arraysize="32" datatype="char" unit="dimensionless" default="NA">
    1414        <DESCRIPTION>Alternate Pan-STARRS name for this object.</DESCRIPTION>
    1515      </FIELD>
    16       <FIELD name="objAltName2" arraysize="100" datatype="char" unit="dimensionless" default="">
     16      <FIELD name="objAltName1" arraysize="32" datatype="char" unit="dimensionless" default="NA">
     17        <DESCRIPTION>Alternate name for this object.</DESCRIPTION>
     18      </FIELD>
     19      <FIELD name="objAltName2" arraysize="32" datatype="char" unit="dimensionless" default="">
    1720        <DESCRIPTION>Altername name for this object.</DESCRIPTION>
    1821      </FIELD>
    19       <FIELD name="objAltName3" arraysize="100" datatype="char" unit="dimensionless" default="">
     22      <FIELD name="objAltName3" arraysize="32" datatype="char" unit="dimensionless" default="">
    2023        <DESCRIPTION>Altername name for this object.</DESCRIPTION>
     24      </FIELD>
     25      <FIELD name="objPopularName" arraysize="140" datatype="char" unit="dimensionless" default="">
     26        <DESCRIPTION>Well known name for this object.</DESCRIPTION>
    2127      </FIELD>
    2228      <FIELD name="objID" arraysize="1" datatype="long" unit="dimensionless" default="NA">

  • branches/eam_branches/ipp-20151113/ippToPsps/jython/diffbatch.py

    r39224 r39266  
    275275        sqlLine.group("psfWidMinor",           self.psfFwhmMinor[num])
    276276
    277         sqlLine.group("kernel",                self.getKeyValue(header, 'PPSUB.KERNEL'))
     277        kernel = self.getKeyValue(header, 'PPSUB.KERNEL')
     278        kernel = kernel.replace(",",";")
     279       
     280        sqlLine.group("kernel",                str(kernel))       
    278281        sqlLine.group("mode",                  self.getKeyValue(header, 'SUBTRACTION.MODE'))
    279282        sqlLine.group("psfTheta",              self.getKeyFloat(header, "%.8f", 'ANGLE'))

  • branches/eam_branches/ipp-20151113/ippToPsps/jython/diffobjectbatch.py

    r39075 r39266  
    210210    def updateDiffObjName(self):
    211211    ##this is a 2 part update:
    212 
    213         self.logger.infoPair("updating diffObjName", "using means")
    214     ## use mean ra and dec (dec >= 0)
    215         sql = "update DiffDetObject set diffObjName =  concat('PSO J', \
    216         lpad(floor(ra/15.),2,'0'), \
    217         lpad(format((ra/15. - (floor(ra/15.)))*60.,0), 2, '0'), \
    218         lpad(format(((ra/15. - (floor(ra/15.)))*60. - floor((ra/15.-(floor(ra/15.)))*60.))*60.,2),5,'0'), \
    219         '+', \
    220         lpad(floor(abs(dec_)),2,'0'), \
    221         lpad(format((abs(dec_)-(floor(abs(dec_))))*60.,0), 2, '0'), \
    222         lpad(format(((abs(dec_)-(floor(abs(dec_))))*60.-floor((abs(dec_)-(floor(abs(dec_))))*60.))*60.,2),5,'0') \
    223         ) where ra > -999 and dec_ > -999 and dec_ >= 0"
    224 
    225         try:
    226             self.scratchDb.execute(sql)
    227         except:
    228             self.logger.errorPair("failed sql", sql)
    229             raise
    230  
    231     ## use mean ra and dec (dec < 0)
    232 
    233         sql = "update DiffDetObject set diffObjName =  concat('PSO J', \
    234         lpad(floor(ra/15.),2,'0'), \
    235         lpad(format((ra/15. - (floor(ra/15.)))*60.,0), 2, '0'), \
    236         lpad(format(((ra/15. - (floor(ra/15.)))*60. - floor((ra/15.-(floor(ra/15.)))*60.))*60.,2),5,'0'), \
    237         '-', \
    238         lpad(floor(abs(dec_)),2,'0'), \
    239         lpad(format((abs(dec_)-(floor(abs(dec_))))*60.,0), 2, '0'), \
    240         lpad(format(((abs(dec_)-(floor(abs(dec_))))*60.-floor((abs(dec_)-(floor(abs(dec_))))*60.))*60.,2),5,'0') \
    241         ) where ra > -999 and dec_ > -999 and dec_ < 0"
    242 
    243         try:
    244             self.scratchDb.execute(sql)
    245         except:
    246             self.logger.errorPair("failed sql", sql)
    247             raise
    248 
    249         ## Update altName with decimal form
    250         self.logger.infoPair("updating diffObjAltName1", "using means")
    251        
    252         sql = "update DiffDetObject SET diffObjAltName1 = concat('PSO J', \
    253         format(ra,4),'+',format(dec_,4)) where ra > -999 AND dec_ > -999 AND dec_ >= 0 "
    254 
    255         try:
    256             self.scratchDb.execute(sql)
    257         except:
    258             self.logger.errorPair("failed sql", sql)
    259             raise
    260             return False
    261 
    262         sql = "update DiffDetObject SET diffObjAltName1 = concat('PSO J', \
    263         format(ra,4),format(dec_,4)) where ra > -999 AND dec_ > -999 AND dec_ < 0"
    264 
    265         try:
    266             self.scratchDb.execute(sql)
    267         except:
    268             self.logger.errorPair("failed sql", sql)
    269             raise
    270             return False
    271 
     212        self.logger.info("Names are now populated with the populateDiffObjectTable call")
     213
     214        return True
    272215
    273216    '''
    … …  
    322265        sqlLine.group("ra",                "RA_MEAN")
    323266        sqlLine.group("dec_",              "DEC_MEAN")
     267        sqlLine.group("diffObjName",       "IAU_NAME")
     268        sqlLine.group("diffObjPSOName",    "PSO_NAME")
    324269        sqlLine.group("nDetections",       "'0'")
    325270        sql = sqlLine.makeRaw(") SELECT ", " FROM " + cptTableName)

  • branches/eam_branches/ipp-20151113/ippToPsps/jython/forcedgalaxybatch.py

    r39224 r39266  
    182182            sqlLine.group("a." + filter[1] + "GalMagErr",       "b.MAG_ERR")
    183183            sqlLine.group("a." + filter[1] + "GalPhi",          "b.THETA")
     184            # CZW: Sersic index is fixed in insert_FGshape_dvopsps_catalog.c.
    184185            sqlLine.group("a." + filter[1] + "GalIndex",        "b.SERSIC_INDEX")
    185186            sqlLine.group("a." + filter[1] + "GalFlags",        "b.FLAGS")

  • branches/eam_branches/ipp-20151113/ippToPsps/jython/forcedobjectbatch.py

    r39007 r39266  
    168168                   ,ForcedMeanObject." + filter[1] + "FPSFFluxErr      = FLUX_PSF_WRP_ERR \
    169169                   ,ForcedMeanObject." + filter[1] + "FPSFFluxStd      = FLUX_PSF_WRP_STDEV \
     170                   ,ForcedMeanObject." + filter[1] + "FPSFMag          = MAG_PSF_WRP \
     171                   ,ForcedMeanObject." + filter[1] + "FPSFMagErr       = MAG_PSF_WRP_ERR \
    170172                   ,ForcedMeanObject." + filter[1] + "FKronFlux        = FLUX_KRON_WRP \
    171173                   ,ForcedMeanObject." + filter[1] + "FKronFluxErr     = FLUX_KRON_WRP_ERR \
    172174                   ,ForcedMeanObject." + filter[1] + "FKronFluxStd     = FLUX_KRON_WRP_STDEV \
     175                   ,ForcedMeanObject." + filter[1] + "FKronMag         = MAG_KRON_WRP \
     176                   ,ForcedMeanObject." + filter[1] + "FKronMagErr      = MAG_KRON_WRP_ERR \
    173177                   ,ForcedMeanObject." + filter[1] + "FApFlux          = FLUX_AP_WRP \
    174178                   ,ForcedMeanObject." + filter[1] + "FApFluxErr       = FLUX_AP_WRP_ERR \
    175179                   ,ForcedMeanObject." + filter[1] + "FApFluxStd       = FLUX_AP_WRP_STDEV \
     180                   ,ForcedMeanObject." + filter[1] + "FApMag           = MAG_AP_WRP \
     181                   ,ForcedMeanObject." + filter[1] + "FApMagErr        = MAG_AP_WRP_ERR \
    176182                   ,ForcedMeanObject." + filter[1] + "Flags            = FLAGS "
    177183
    … …  
    253259                   ,ForcedMeanObject." + filter[1] + "FmeanflxR5Std   =  FLUX_STD_AP_R5 \
    254260                   ,ForcedMeanObject." + filter[1] + "FmeanflxR5Fill  =  FLUX_FIL_AP_R5 \
     261                   ,ForcedMeanObject." + filter[1] + "FmeanMagR5      =  MAG_AP_R5 \
     262                   ,ForcedMeanObject." + filter[1] + "FmeanMagR5Err   =  MAG_ERR_AP_R5 \
    255263                   ,ForcedMeanObject." + filter[1] + "FmeanflxR6      =  FLUX_AP_R6 \
    256264                   ,ForcedMeanObject." + filter[1] + "FmeanflxR6Err   =  FLUX_ERR_AP_R6 \
    257265                   ,ForcedMeanObject." + filter[1] + "FmeanflxR6Std   =  FLUX_STD_AP_R6 \
    258266                   ,ForcedMeanObject." + filter[1] + "FmeanflxR6Fill  =  FLUX_FIL_AP_R6 \
     267                   ,ForcedMeanObject." + filter[1] + "FmeanMagR6      =  MAG_AP_R6 \
     268                   ,ForcedMeanObject." + filter[1] + "FmeanMagR6Err   =  MAG_ERR_AP_R6 \
    259269                   ,ForcedMeanObject." + filter[1] + "FmeanflxR7      =  FLUX_AP_R7 \
    260270                   ,ForcedMeanObject." + filter[1] + "FmeanflxR7Err   =  FLUX_ERR_AP_R7 \
    261271                   ,ForcedMeanObject." + filter[1] + "FmeanflxR7Std   =  FLUX_STD_AP_R7 \
    262272                   ,ForcedMeanObject." + filter[1] + "FmeanflxR7Fill  =  FLUX_FIL_AP_R7 \
     273                   ,ForcedMeanObject." + filter[1] + "FmeanMagR7      =  MAG_AP_R7 \
     274                   ,ForcedMeanObject." + filter[1] + "FmeanMagR7Err   =  MAG_ERR_AP_R7 \
    263275                   ,ForcedMeanObject." + filter[1] + "E1              =  E1 \
    264276                   ,ForcedMeanObject." + filter[1] + "E2              =  E2 "

  • branches/eam_branches/ipp-20151113/ippToPsps/jython/objectbatch.py

    r39099 r39266  
    247247    '''
    248248    def updateObjName(self):
    249     ##this is a 4 part update:
    250         self.logger.infoPair("updating objName", "using stacks")
    251 
    252     ## if we have a stackra and dec, use stackra and dec , dec >=0
    253 
    254         sql = "update ObjectThin set objName =  concat('PSO J', \
    255         lpad(floor(raStack/15.),2,'0'), \
    256         lpad(format((raStack/15. - (floor(raStack/15.)))*60.,0), 2, '0'), \
    257         lpad(format(((raStack/15. - (floor(raStack/15.)))*60. - floor((raStack/15.-(floor(raStack/15.)))*60.))*60.,2),5,'0'), \
    258         '+', \
    259         lpad(floor(abs(decStack)),2,'0'), \
    260         lpad(format((abs(decStack)-(floor(abs(decStack))))*60.,0), 2, '0'), \
    261         lpad(format(((abs(decStack)-(floor(abs(decStack))))*60.-floor((abs(decStack)-(floor(abs(decStack))))*60.))*60.,2),5,'0') \
    262         ) where raStack > -999 and decStack > -999 and decStack >= 0"
    263         try:
    264             self.scratchDb.execute(sql)
    265         except:
    266             self.logger.errorPair("failed sql", sql)
    267             raise
    268             return False
    269 
    270     ## if we have a stackra and dec, use stackra and dec, dec < 0
    271 
    272         sql = "update ObjectThin set objName =  concat('PSO J', \
    273         lpad(floor(raStack/15.),2,'0'), \
    274         lpad(format((raStack/15. - (floor(raStack/15.)))*60.,0), 2, '0'), \
    275         lpad(format(((raStack/15. - (floor(raStack/15.)))*60. - floor((raStack/15.-(floor(raStack/15.)))*60.))*60.,2),5,'0'), \
    276         '-', \
    277         lpad(floor(abs(decStack)),2,'0'), \
    278         lpad(format((abs(decStack)-(floor(abs(decStack))))*60.,0), 2, '0'), \
    279         lpad(format(((abs(decStack)-(floor(abs(decStack))))*60.-floor((abs(decStack)-(floor(abs(decStack))))*60.))*60.,2),5,'0') \
    280         ) where raStack > -999 and decStack > -999 and decStack < 0"
    281         try:
    282             self.scratchDb.execute(sql)
    283         except:
    284             self.logger.errorPair("failed sql", sql)
    285             raise
    286             return False
    287 
    288         self.logger.infoPair("updating objName", "using means")
    289 
    290 
    291     ## use mean ra and dec (dec >= 0)
    292         sql = "update ObjectThin set objName =  concat('PSO J', \
    293         lpad(floor(raMean/15.),2,'0'), \
    294         lpad(format((raMean/15. - (floor(raMean/15.)))*60.,0), 2, '0'), \
    295         lpad(format(((raMean/15. - (floor(raMean/15.)))*60. - floor((raMean/15.-(floor(raMean/15.)))*60.))*60.,2),5,'0'), \
    296         '+', \
    297         lpad(floor(abs(decMean)),2,'0'), \
    298         lpad(format((abs(decMean)-(floor(abs(decMean))))*60.,0), 2, '0'), \
    299         lpad(format(((abs(decMean)-(floor(abs(decMean))))*60.-floor((abs(decMean)-(floor(abs(decMean))))*60.))*60.,2),5,'0') \
    300         ) where raMean > -999 and decMean > -999 and decMean >= 0 AND objName IS NULL"
    301 
    302         try:
    303             self.scratchDb.execute(sql)
    304         except:
    305             self.logger.errorPair("failed sql", sql)
    306             raise
    307             return False
    308  
    309     ## use mean ra and dec (dec < 0)
    310 
    311         sql = "update ObjectThin set objName =  concat('PSO J', \
    312         lpad(floor(raMean/15.),2,'0'), \
    313         lpad(format((raMean/15. - (floor(raMean/15.)))*60.,0), 2, '0'), \
    314         lpad(format(((raMean/15. - (floor(raMean/15.)))*60. - floor((raMean/15.-(floor(raMean/15.)))*60.))*60.,2),5,'0'), \
    315         '-', \
    316         lpad(floor(abs(decMean)),2,'0'), \
    317         lpad(format((abs(decMean)-(floor(abs(decMean))))*60.,0), 2, '0'), \
    318         lpad(format(((abs(decMean)-(floor(abs(decMean))))*60.-floor((abs(decMean)-(floor(abs(decMean))))*60.))*60.,2),5,'0') \
    319         ) where raMean > -999 and decMean > -999 and decMean < 0 AND objName IS NULL"
    320         try:
    321             self.scratchDb.execute(sql)
    322         except:
    323             self.logger.errorPair("failed sql", sql)
    324             raise
    325             return False
    326 
    327 
    328         # update altname
    329         self.logger.infoPair("updating objAltName1", "using stacks")
    330        
    331         sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
    332         format(raStack,4),'+',format(decStack,4)) where raStack > -999 AND decStack > -999 AND decStack >= 0 "
    333         try:
    334             self.scratchDb.execute(sql)
    335         except:
    336             self.logger.errorPair("failed sql", sql)
    337             raise
    338             return False
    339 
    340         sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
    341         format(raStack,4),format(decStack,4)) where raStack > -999 AND decStack > -999 AND decStack < 0 "
    342         try:
    343             self.scratchDb.execute(sql)
    344         except:
    345             self.logger.errorPair("failed sql", sql)
    346             raise
    347             return False
    348 
    349         self.logger.infoPair("updating objAltName1", "using means")
    350        
    351         sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
    352         format(raMean,4),'+',format(decMean,4)) where raMean > -999 AND decMean > -999 AND decMean >= 0 AND objAltName1 IS NULL"
    353         try:
    354             self.scratchDb.execute(sql)
    355         except:
    356             self.logger.errorPair("failed sql", sql)
    357             raise
    358             return False
    359 
    360         sql = "update ObjectThin SET objAltName1 = concat('PSO J', \
    361         format(raMean,4),format(decMean,4)) where raMean > -999 AND decMean > -999 AND decMean < 0 AND objAltName1 IS NULL"
    362         try:
    363             self.scratchDb.execute(sql)
    364         except:
    365             self.logger.errorPair("failed sql", sql)
    366             raise
    367             return False
    368 
    369        
    370 
    371 
     249        self.logger.info("Names are now populated with the populateObjectThinTable call")
     250
     251        return True
    372252    '''
    373253    Populates the Object table
    … …  
    428308        sqlLine.group("raMean",          "RA_MEAN")
    429309        sqlLine.group("decMean",         "DEC_MEAN")
     310        sqlLine.group("objName",         "IAU_NAME")
     311        sqlLine.group("objPSOName",      "PSO_NAME")
    430312        sqlLine.group("epochMean",       "EPOCH_MEAN")
    431313        sqlLine.group("raMeanErr",       "RA_ERR")

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

    r39119 r39266  
    9292               validFilterCount=validFilterCount + 1
    9393           if (stackID <= 0):
     94               self.stackEpochs[filter] = -999
    9495               continue
    9596               

  • branches/eam_branches/ipp-20151113/ippToPsps/test/mksasdata.dvo

    r39134 r39266  
    179179end
    180180
     181# create a populated catdir with a set of cmf files, save the filenames in list for use by insert.exp
     182macro mkcatdir.ffg
     183  if ($0 != 2)
     184    echo "mkcatdir.ffg (catdir)"
     185    break
     186  end
     187
     188  $catdir = $1
     189
     190  for i 0 $galfiles:n
     191    list word -split $galfiles:$i
     192    $cmffile = $word:0
     193    $stkID = $word:1
     194    $filter = $word:2
     195    echo loadgalphot -D CATDIR $catdir -photcode GPC1.$filter.ForcedWarp -image-id $stkID $cmffile
     196    exec loadgalphot -D CATDIR $catdir -photcode GPC1.$filter.ForcedWarp -image-id $stkID $cmffile
     197  end
     198end
     199
    181200macro mkcal
    182201  # run relphot
Note: See TracChangeset for help on using the changeset viewer.