IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38723


Ignore:
Timestamp:
Sep 10, 2015, 2:44:01 PM (11 years ago)
Author:
heather
Message:

HAF/EAM/KCC schema changes from IAU

Location:
trunk/ippToPsps
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r38602 r38723  
    7878        <DESCRIPTION>elements of rotation/scale matrix</DESCRIPTION>
    7979      </FIELD>
    80       <FIELD name="calibModNum" arraysize="1" datatype="short" unit="dimensionless" default="NA">
    81         <DESCRIPTION>calibration modification number</DESCRIPTION>
    82       </FIELD>
    8380      <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    8481        <DESCRIPTION>Data release</DESCRIPTION>
    … …  
    169166        <DESCRIPTION>airmass (informational)</DESCRIPTION>
    170167      </FIELD>
    171       <FIELD name="psfFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
     168      <FIELD name="DpsfFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    172169        <DESCRIPTION> PSF instrumental flux (in analog-to-digital units/sec) or adu/sec</DESCRIPTION>
    173170      </FIELD>
    174       <FIELD name="psfFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
     171      <FIELD name="DpsfFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    175172        <DESCRIPTION> estimated error in flux</DESCRIPTION>
    176173      </FIELD>
    177       <FIELD name="psfMajorFWHM" arraysize="1" datatype="float" unit="arcsec" default="-999">
     174      <FIELD name="DpsfMajorFWHM" arraysize="1" datatype="float" unit="arcsec" default="-999">
    178175        <DESCRIPTION> model PSF width in major axis</DESCRIPTION>
    179176      </FIELD>
    180       <FIELD name="psfMinorFWHM" arraysize="1" datatype="float" unit="arcsec" default="-999">
     177      <FIELD name="DpsfMinorFWHM" arraysize="1" datatype="float" unit="arcsec" default="-999">
    181178        <DESCRIPTION> model PSF width in minor axis</DESCRIPTION>
    182179      </FIELD>
    183       <FIELD name="psfTheta" arraysize="1" datatype="float" unit="degrees" default="-999">
     180      <FIELD name="DpsfTheta" arraysize="1" datatype="float" unit="degrees" default="-999">
    184181        <DESCRIPTION> model PSF orientation angle degrees East of North</DESCRIPTION>
    185182      </FIELD>
    186       <FIELD name="psfCore" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     183      <FIELD name="DpsfCore" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    187184        <DESCRIPTION>model PSF core parameter [k in (1 + kz + z^1.66)]</DESCRIPTION>
    188185      </FIELD>
    189       <FIELD name="psfQf" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     186      <FIELD name="DpsfQf" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    190187        <DESCRIPTION>PSF coverage factor</DESCRIPTION>
    191188      </FIELD>
    192       <FIELD name="psfQfPerfect" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     189      <FIELD name="DpsfQfPerfect" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    193190        <DESCRIPTION>PSF-weighted fraction of pixels totally unmasked</DESCRIPTION>
    194191      </FIELD>
    195       <FIELD name="psfChiSq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     192      <FIELD name="DpsfChiSq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    196193        <DESCRIPTION>reduced-chisq of the psf model fit. (ndof?, npix?)</DESCRIPTION>
    197194      </FIELD>
    198       <FIELD name="psfLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     195      <FIELD name="DpsfLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    199196        <DESCRIPTION>PSF likelihood</DESCRIPTION>
    200197      </FIELD>
    201       <FIELD name="momentXX" arraysize="1" datatype="float" unit="raw pixels" default="-999">
     198      <FIELD name="DmomentXX" arraysize="1" datatype="float" unit="raw pixels" default="-999">
    202199        <DESCRIPTION> moment XX</DESCRIPTION>
    203200      </FIELD>
    204       <FIELD name="momentXY" arraysize="1" datatype="float" unit="raw pixels" default="-999">
     201      <FIELD name="DmomentXY" arraysize="1" datatype="float" unit="raw pixels" default="-999">
    205202        <DESCRIPTION> moment XY</DESCRIPTION>
    206203      </FIELD>
    207       <FIELD name="momentYY" arraysize="1" datatype="float" unit="raw pixels" default="-999">
     204      <FIELD name="DmomentYY" arraysize="1" datatype="float" unit="raw pixels" default="-999">
    208205        <DESCRIPTION> moment YY</DESCRIPTION>
    209206      </FIELD>
    210       <FIELD name="momentR1" arraysize="1" datatype="float" unit="raw pixels" default="-999">
     207      <FIELD name="DmomentR1" arraysize="1" datatype="float" unit="raw pixels" default="-999">
    211208        <DESCRIPTION> first radial moment</DESCRIPTION>
    212209      </FIELD>
    213       <FIELD name="momentRH" arraysize="1" datatype="float" unit="raw pixels" default="-999">
    214         <DESCRIPTION> half radial moment</DESCRIPTION>
    215       </FIELD>
    216       <FIELD name="momentM3C" arraysize="1" datatype="float" unit="raw pixels" default="-999">
     210      <FIELD name="DmomentRH" arraysize="1" datatype="float" unit="raw pixels" default="-999">
     211        <DESCRIPTION> r^1/2 weighted moment</DESCRIPTION>
     212      </FIELD>
     213      <FIELD name="DmomentM3C" arraysize="1" datatype="float" unit="raw pixels" default="-999">
    217214        <DESCRIPTION> 3rd moment cos(theta)</DESCRIPTION>
    218215      </FIELD>
    219       <FIELD name="momentM3S" arraysize="1" datatype="float" unit="raw pixels" default="-999">
     216      <FIELD name="DmomentM3S" arraysize="1" datatype="float" unit="raw pixels" default="-999">
    220217        <DESCRIPTION> 3rd moment sin(theta)</DESCRIPTION>
    221218      </FIELD>
    222       <FIELD name="momentM4C" arraysize="1" datatype="float" unit="raw pixels" default="-999">
     219      <FIELD name="DmomentM4C" arraysize="1" datatype="float" unit="raw pixels" default="-999">
    223220        <DESCRIPTION> 4th moment cos(theta)</DESCRIPTION>
    224221      </FIELD>
    225       <FIELD name="momentM4S" arraysize="1" datatype="float" unit="raw pixels" default="-999">
     222      <FIELD name="DmomentM4S" arraysize="1" datatype="float" unit="raw pixels" default="-999">
    226223        <DESCRIPTION> 4th moment sin(theta)</DESCRIPTION>
    227224      </FIELD>
    228       <FIELD name="apFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
     225      <FIELD name="DapFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    229226        <DESCRIPTION> Aperture Flux</DESCRIPTION>
    230227      </FIELD>
    231       <FIELD name="apFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
     228      <FIELD name="DapFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    232229        <DESCRIPTION> Aperture Flux error</DESCRIPTION>
    233230      </FIELD>
    234       <FIELD name="apFillF" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     231      <FIELD name="DapFillF" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    235232        <DESCRIPTION> Aperture fill factor</DESCRIPTION>
    236233      </FIELD>
    237       <FIELD name="kronFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
     234      <FIELD name="DkronFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    238235        <DESCRIPTION> Kron flux</DESCRIPTION>
    239236      </FIELD>
    240       <FIELD name="kronFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
     237      <FIELD name="DkronFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    241238        <DESCRIPTION> Kron flux error</DESCRIPTION>
    242239      </FIELD>
    243       <FIELD name="kronRad" arraysize="1" datatype="float" unit="raw pixels" default="-999">
     240      <FIELD name="DkronRad" arraysize="1" datatype="float" unit="raw pixels" default="-999">
    244241        <DESCRIPTION> Kron radius</DESCRIPTION>
    245242      </FIELD>
    … …  
    271268        <DESCRIPTION>signal to noise of neg match source</DESCRIPTION>
    272269      </FIELD>
    273       <FIELD name="sky" arraysize="1" datatype="float" unit="adu/sec/pixel" default="-999">
     270      <FIELD name="Dsky" arraysize="1" datatype="float" unit="adu/sec/pixel" default="-999">
    274271        <DESCRIPTION> PSF sky level at source</DESCRIPTION>
    275272      </FIELD>
    276       <FIELD name="skyErr" arraysize="1" datatype="float" unit="adu/sec/pixel" default="-999">
     273      <FIELD name="DskyErr" arraysize="1" datatype="float" unit="adu/sec/pixel" default="-999">
    277274        <DESCRIPTION> estimated error in sky</DESCRIPTION>
    278275      </FIELD>
    279       <FIELD name="infoFlag" arraysize="1" datatype="long" unit="dimensionless" default="-999">
     276      <FIELD name="DinfoFlag" arraysize="1" datatype="long" unit="dimensionless" default="-999">
    280277        <DESCRIPTION>flag indicating provenance information</DESCRIPTION>
    281278      </FIELD>
    282       <FIELD name="infoFlag2" arraysize="1" datatype="long" unit="dimensionless" default="-999">
     279      <FIELD name="DinfoFlag2" arraysize="1" datatype="long" unit="dimensionless" default="-999">
    283280        <DESCRIPTION>flag indicating provenance information</DESCRIPTION>
    284281      </FIELD>
    285       <FIELD name="infoFlag3" arraysize="1" datatype="long" unit="dimensionless" default="-999">
     282      <FIELD name="DinfoFlag3" arraysize="1" datatype="long" unit="dimensionless" default="-999">
    286283        <DESCRIPTION>flag indicating provenance information</DESCRIPTION>
    287284      </FIELD>

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

    r38397 r38723  
    77      <PARAM arraysize="1" datatype="char" ucd="meta.bib.author" name="Author" value="PSPS"></PARAM>
    88      <FIELD name="diffObjName" arraysize="100" datatype="char" unit="alphanumeric" default="NA">
    9         <DESCRIPTION>IAU Name constructed from objID position PS1.x JHHMMSS.SS+/-</DESCRIPTION>
     9        <DESCRIPTION>IAU Name constructed from objID position PSO JHHMMSS.SS+/-</DESCRIPTION>
    1010      </FIELD>
    1111      <FIELD name="diffObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">

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

    r38397 r38723  
    2424        <DESCRIPTION>batch id</DESCRIPTION>
    2525      </FIELD>
     26      <FIELD name="dataRelease" arraysize="1" datatype="unsigned byte" unit="dimensionless" default="NA">
     27        <DESCRIPTION>data release number</DESCRIPTION>
     28      </FIELD>
    2629      <FIELD name="gnTotal" arraysize="1" datatype="short" unit="dimensionless" default="-999">
    2730        <DESCRIPTION>number of detections in g filter</DESCRIPTION>
    … …  
    111114        <DESCRIPTION>flags for g forced</DESCRIPTION>
    112115      </FIELD>
    113       <FIELD name="gGamma" arraysize="1" datatype="float" unit="arcsec^2" default="-999">
    114         <DESCRIPTION>second moment (Mxx+Myy)</DESCRIPTION>
    115       </FIELD>
    116116      <FIELD name="gE1" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    117117        <DESCRIPTION>polarization, KSB-corrected (Mxx - Myy) / (Mxx + Myy)</DESCRIPTION>
    … …  
    204204        <DESCRIPTION>estimated filling factor at R7</DESCRIPTION>
    205205      </FIELD>
    206      
    207206      <FIELD name="rFlags" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    208207        <DESCRIPTION>flags for r forced</DESCRIPTION>
    209       </FIELD>
    210       <FIELD name="rGamma" arraysize="1" datatype="float" unit="arcsec^2" default="-999">
    211         <DESCRIPTION>second moment (Mxx+Myy)</DESCRIPTION>
    212208      </FIELD>
    213209      <FIELD name="rE1" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    … …  
    304300        <DESCRIPTION>flags for i forced</DESCRIPTION>
    305301      </FIELD>
    306       <FIELD name="iGamma" arraysize="1" datatype="float" unit="arcsec^2" default="-999">
    307         <DESCRIPTION>second moment (Mxx+Myy)</DESCRIPTION>
    308       </FIELD>
    309302      <FIELD name="iE1" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    310303        <DESCRIPTION>polarization, KSB-corrected (Mxx - Myy) / (Mxx + Myy)</DESCRIPTION>
    … …  
    397390        <DESCRIPTION>estimated filling factor at R7</DESCRIPTION>
    398391      </FIELD>
    399 
    400392      <FIELD name="zFlags" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    401393        <DESCRIPTION>flags for z forced</DESCRIPTION>
    402394      </FIELD>
    403       <FIELD name="zGamma" arraysize="1" datatype="float" unit="arcsec^2" default="-999">
    404         <DESCRIPTION>second moment (Mxx+Myy)</DESCRIPTION>
    405       </FIELD>
    406395      <FIELD name="zE1" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    407396        <DESCRIPTION>polarization, KSB-corrected (Mxx - Myy) / (Mxx + Myy)</DESCRIPTION>
    … …  
    496485      <FIELD name="yFlags" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    497486        <DESCRIPTION>flags for y forced</DESCRIPTION>
    498       </FIELD>
    499       <FIELD name="yGamma" arraysize="1" datatype="float" unit="arcsec^2" default="-999">
    500         <DESCRIPTION>second moment (Mxx+Myy)</DESCRIPTION>
    501487      </FIELD>
    502488      <FIELD name="yE1" arraysize="1" datatype="float" unit="dimensionless" default="-999">

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

    r38602 r38723  
    9999        <DESCRIPTION>elements of rotation/scale matrix</DESCRIPTION>
    100100      </FIELD>
    101       <FIELD name="calibModNum" arraysize="1" datatype="short" unit="dimensionless" default="NA">
    102         <DESCRIPTION>calibration modification number</DESCRIPTION>
    103       </FIELD>
    104101      <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    105102        <DESCRIPTION>Data release</DESCRIPTION>
    … …  
    164161        <DESCRIPTION>airmass (informational)</DESCRIPTION>
    165162      </FIELD>
    166       <FIELD name="psfFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
     163      <FIELD name="FpsfFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    167164        <DESCRIPTION> PSF instrumental flux (in analog-to-digital units/sec) or adu/sec</DESCRIPTION>
    168165      </FIELD>
    169       <FIELD name="psfFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
     166      <FIELD name="FpsfFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    170167        <DESCRIPTION> estimated error in flux</DESCRIPTION>
    171168      </FIELD>
    172       <FIELD name="psfMajorFWHM" arraysize="1" datatype="float" unit="arcsec" default="-999">
     169      <FIELD name="FpsfMajorFWHM" arraysize="1" datatype="float" unit="arcsec" default="-999">
    173170        <DESCRIPTION>model PSF width in major axis</DESCRIPTION>
    174171      </FIELD>
    175       <FIELD name="psfMinorFWHM" arraysize="1" datatype="float" unit="arcsec" default="-999">
     172      <FIELD name="FpsfMinorFWHM" arraysize="1" datatype="float" unit="arcsec" default="-999">
    176173        <DESCRIPTION>model PSF width in minor axis</DESCRIPTION>
    177174      </FIELD>
    178       <FIELD name="psfTheta" arraysize="1" datatype="float" unit="degrees" default="-999">
     175      <FIELD name="FpsfTheta" arraysize="1" datatype="float" unit="degrees" default="-999">
    179176        <DESCRIPTION>model PSF orientation angles degrees East of North</DESCRIPTION>
    180177      </FIELD>
    181       <FIELD name="psfCore" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     178      <FIELD name="FpsfCore" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    182179        <DESCRIPTION>model PSF core parameter [k in (1 + kz + z^1.66)]</DESCRIPTION>
    183180      </FIELD>
    184       <FIELD name="psfQf" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     181      <FIELD name="FpsfQf" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    185182        <DESCRIPTION>PSF coverage factor</DESCRIPTION>
    186183      </FIELD>
    187       <FIELD name="psfQfPerfect" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     184      <FIELD name="FpsfQfPerfect" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    188185        <DESCRIPTION>PSF-weighted fraction of pixels totally unmasked</DESCRIPTION>
    189186      </FIELD>
    190       <FIELD name="psfChiSq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     187      <FIELD name="FpsfChiSq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    191188        <DESCRIPTION>reduced-chisq of the psf model fit. (ndof?, npix?)</DESCRIPTION>
    192189      </FIELD>
    193       <FIELD name="psfLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     190      <FIELD name="FpsfLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    194191        <DESCRIPTION>PSF likelihood</DESCRIPTION>
    195192      </FIELD>
    196       <FIELD name="momentXX" arraysize="1" datatype="float" unit="warp pixels" default="-999">
     193      <FIELD name="FmomentXX" arraysize="1" datatype="float" unit="warp pixels" default="-999">
    197194        <DESCRIPTION> moment XX</DESCRIPTION>
    198195      </FIELD>
    199       <FIELD name="momentXY" arraysize="1" datatype="float" unit="warp pixels" default="-999">
     196      <FIELD name="FmomentXY" arraysize="1" datatype="float" unit="warp pixels" default="-999">
    200197        <DESCRIPTION> moment XY</DESCRIPTION>
    201198      </FIELD>
    202       <FIELD name="momentYY" arraysize="1" datatype="float" unit="warp pixels" default="-999">
     199      <FIELD name="FmomentYY" arraysize="1" datatype="float" unit="warp pixels" default="-999">
    203200        <DESCRIPTION> moment YY</DESCRIPTION>
    204201      </FIELD>
    205       <FIELD name="momentR1" arraysize="1" datatype="float" unit="warp pixels" default="-999">
     202      <FIELD name="FmomentR1" arraysize="1" datatype="float" unit="warp pixels" default="-999">
    206203        <DESCRIPTION> first radial moment</DESCRIPTION>
    207204      </FIELD>
    208       <FIELD name="momentRH" arraysize="1" datatype="float" unit="warp pixels" default="-999">
     205      <FIELD name="FmomentRH" arraysize="1" datatype="float" unit="warp pixels" default="-999">
    209206        <DESCRIPTION> half radial moment</DESCRIPTION>
    210207      </FIELD>
    211       <FIELD name="momentM3C" arraysize="1" datatype="float" unit="warp pixels" default="-999">
     208      <FIELD name="FmomentM3C" arraysize="1" datatype="float" unit="warp pixels" default="-999">
    212209        <DESCRIPTION> 3rd moment cos(theta)</DESCRIPTION>
    213210      </FIELD>
    214       <FIELD name="momentM3S" arraysize="1" datatype="float" unit="warp pixels" default="-999">
     211      <FIELD name="FmomentM3S" arraysize="1" datatype="float" unit="warp pixels" default="-999">
    215212        <DESCRIPTION> 3rd moment sin(theta)</DESCRIPTION>
    216213      </FIELD>
    217       <FIELD name="momentM4C" arraysize="1" datatype="float" unit="warp pixels" default="-999">
     214      <FIELD name="FmomentM4C" arraysize="1" datatype="float" unit="warp pixels" default="-999">
    218215        <DESCRIPTION> 4th moment cos(theta)</DESCRIPTION>
    219216      </FIELD>
    220       <FIELD name="momentM4S" arraysize="1" datatype="float" unit="warp pixels" default="-999">
     217      <FIELD name="FmomentM4S" arraysize="1" datatype="float" unit="warp pixels" default="-999">
    221218        <DESCRIPTION> 4th moment sin(theta)</DESCRIPTION>
    222219      </FIELD>
    223       <FIELD name="apFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
     220      <FIELD name="FapFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    224221        <DESCRIPTION> Aperture Flux</DESCRIPTION>
    225222      </FIELD>
    226       <FIELD name="apFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
     223      <FIELD name="FapFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    227224        <DESCRIPTION> Aperture Flux error</DESCRIPTION>
    228225      </FIELD>
    229       <FIELD name="apFillF" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     226      <FIELD name="FapFillF" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    230227        <DESCRIPTION> Aperture fill factor</DESCRIPTION>
    231228      </FIELD>
    232       <FIELD name="kronFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
     229      <FIELD name="FkronFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    233230        <DESCRIPTION> Kron flux</DESCRIPTION>
    234231      </FIELD>
    235       <FIELD name="kronFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
     232      <FIELD name="FkronFluxErr" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    236233        <DESCRIPTION> Kron flux error</DESCRIPTION>
    237234      </FIELD>
    238       <FIELD name="kronRad" arraysize="1" datatype="float" unit="arcsec" default="-999">
     235      <FIELD name="FkronRad" arraysize="1" datatype="float" unit="arcsec" default="-999">
    239236        <DESCRIPTION> Kron radius</DESCRIPTION>
    240237      </FIELD>
    241       <FIELD name="sky" arraysize="1" datatype="float" unit="adu/sec/pixel" default="-999">
     238      <FIELD name="Fsky" arraysize="1" datatype="float" unit="adu/sec/pixel" default="-999">
    242239        <DESCRIPTION> PSF sky level at source</DESCRIPTION>
    243240      </FIELD>
    244       <FIELD name="skyErr" arraysize="1" datatype="float" unit="adu/sec/pixel" default="-999">
     241      <FIELD name="FskyErr" arraysize="1" datatype="float" unit="adu/sec/pixel" default="-999">
    245242        <DESCRIPTION> estimated error in sky</DESCRIPTION>
    246243      </FIELD>
    247        <FIELD name="infoFlag" arraysize="1" datatype="long" unit="dimensionless" default="-999">
     244       <FIELD name="FinfoFlag" arraysize="1" datatype="long" unit="dimensionless" default="-999">
    248245        <DESCRIPTION>flag indicating provenance information</DESCRIPTION>
    249246      </FIELD>
    250        <FIELD name="infoFlag2" arraysize="1" datatype="long" unit="dimensionless" default="-999">
     247       <FIELD name="FinfoFlag2" arraysize="1" datatype="long" unit="dimensionless" default="-999">
    251248        <DESCRIPTION>combination of cmf and dvo flags</DESCRIPTION>
    252249      </FIELD>
    253        <FIELD name="infoFlag3" arraysize="1" datatype="long" unit="dimensionless" default="-999">
     250       <FIELD name="FinfoFlag3" arraysize="1" datatype="long" unit="dimensionless" default="-999">
    254251        <DESCRIPTION>combination of cmf and dvo flags</DESCRIPTION>
    255252      </FIELD>

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

    r38602 r38723  
    144144        <DESCRIPTION>polynomial coefficients for the astrometric fit</DESCRIPTION>
    145145      </FIELD>
    146       <FIELD name="calibModNum" arraysize="1" datatype="short" unit="dimensionless" default="NA">
    147         <DESCRIPTION>calibration modification number</DESCRIPTION>
    148       </FIELD>
    149146      <FIELD name="batchID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    150147        <DESCRIPTION>batchID</DESCRIPTION>
    … …  
    367364        <DESCRIPTION>polynomial coefficients for the astrometric fit</DESCRIPTION>
    368365      </FIELD>
    369       <FIELD name="calibModNum" arraysize="1" datatype="short" unit="dimensionless" default="NA">
    370         <DESCRIPTION>calibration modification number</DESCRIPTION>
    371       </FIELD>
    372366      <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    373367        <DESCRIPTION>Data release</DESCRIPTION>
    … …  
    501495      </FIELD>
    502496      <FIELD name="momentRH" arraysize="1" datatype="float" unit="raw pixels" default="-999">
    503         <DESCRIPTION> half radial moment</DESCRIPTION>
     497        <DESCRIPTION>r^1/2 weighted moment</DESCRIPTION>
    504498      </FIELD>
    505499      <FIELD name="momentM3C" arraysize="1" datatype="float" unit="raw pixels" default="-999">

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

    r38602 r38723  
    112112      <FIELD name="pc002002" arraysize="1" datatype="double" unit="dimensionless" default="-999">
    113113        <DESCRIPTION>elements of rotation/scale matrix</DESCRIPTION>
    114       </FIELD>
    115       <FIELD name="calibModNum" arraysize="1" datatype="short" unit="dimensionless" default="NA">
    116         <DESCRIPTION>calibration modification number</DESCRIPTION>
    117114      </FIELD>
    118115      <FIELD name="dataRelease" arraysize="1" datatype="unsignedByte" unit="dimensionless" default="NA">
    … …  
    521518      </FIELD>
    522519      <FIELD name="gmomentRH" arraysize="1" datatype="float" unit="sqrt arcsec" default="-999">
    523         <DESCRIPTION> moment RH</DESCRIPTION>
     520        <DESCRIPTION>r^1/2 weighted moment</DESCRIPTION>
    524521      </FIELD>
    525522      <FIELD name="gPSFFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    … …  
    625622      </FIELD>
    626623      <FIELD name="rmomentRH" arraysize="1" datatype="float" unit="sqrt arcsec" default="-999">
    627         <DESCRIPTION> moment RH</DESCRIPTION>
     624        <DESCRIPTION>r^1/2 weighted moment</DESCRIPTION>
    628625      </FIELD>
    629626      <FIELD name="rPSFFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    … …  
    728725      </FIELD>
    729726      <FIELD name="imomentRH" arraysize="1" datatype="float" unit="sqrt arcsec" default="-999">
    730         <DESCRIPTION> moment RH</DESCRIPTION>
     727        <DESCRIPTION>r^ 1/2 weighted moment</DESCRIPTION>
    731728      </FIELD>
    732729      <FIELD name="iPSFFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    … …  
    832829      </FIELD>
    833830      <FIELD name="zmomentRH" arraysize="1" datatype="float" unit="sqrt arcsec" default="-999">
    834         <DESCRIPTION> moment RH</DESCRIPTION>
     831        <DESCRIPTION>r^1/2 weighted moment</DESCRIPTION>
    835832      </FIELD>
    836833      <FIELD name="zPSFFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
    … …  
    935932      </FIELD>
    936933      <FIELD name="ymomentRH" arraysize="1" datatype="float" unit="sqrt arcsec" default="-999">
    937         <DESCRIPTION> moment RH</DESCRIPTION>
     934        <DESCRIPTION>r^1/2 weighted moment</DESCRIPTION>
    938935      </FIELD>
    939936      <FIELD name="yPSFFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">

  • trunk/ippToPsps/jython/diffobjectbatch.py

    r38397 r38723  
    213213        self.logger.infoPair("updating diffObjName", "using means")
    214214    ## use mean ra and dec (dec >= 0)
    215         sql = "update DiffDetObject set diffObjName =  concat('PS1.2 J', \
     215        sql = "update DiffDetObject set diffObjName =  concat('PSO J', \
    216216        lpad(floor(ra/15.),2,'0'), \
    217217        lpad((ra/15.-(floor(ra/15.)))*60. ,2,'0'), \
    … …  
    230230    ## use mean ra and dec (dec < 0)
    231231
    232         sql = "update DiffDetObject set diffObjName =  concat('PS1.2 J', \
     232        sql = "update DiffDetObject set diffObjName =  concat('PSO J', \
    233233        lpad(floor(ra/15.),2,'0'), \
    234234        lpad((ra/15.-(floor(ra/15.)))*60. ,2,'0'), \

  • trunk/ippToPsps/jython/objectbatch.py

    r38397 r38723  
    250250    ## if we have a stackra and dec, use stackra and dec , dec >=0
    251251
    252         sql = "update ObjectThin set objName =  concat('PS1.2 J', \
     252        sql = "update ObjectThin set objName =  concat('PSO J', \
    253253        lpad(floor(raStack/15.),2,'0'), \
    254254        lpad((raStack/15.-(floor(raStack/15.)))*60. ,2,'0'), \
    … …  
    269269    ## if we have a stackra and dec, use stackra and dec, dec < 0
    270270
    271         sql = "update ObjectThin set objName =  concat('PS1.2 J', \
     271        sql = "update ObjectThin set objName =  concat('PSO J', \
    272272        lpad(floor(raStack/15.),2,'0'), \
    273273        lpad((raStack/15.-(floor(raStack/15.)))*60. ,2,'0'), \
    … …  
    286286        self.logger.infoPair("updating objName", "using means")
    287287    ## use mean ra and dec (dec >= 0)
    288         sql = "update ObjectThin set objName =  concat('PS1.2 J', \
     288        sql = "update ObjectThin set objName =  concat('PSO J', \
    289289        lpad(floor(raMean/15.),2,'0'), \
    290290        lpad((raMean/15.-(floor(raMean/15.)))*60. ,2,'0'), \
    … …  
    304304    ## use mean ra and dec (dec < 0)
    305305
    306         sql = "update ObjectThin set objName =  concat('PS1.2 J', \
     306        sql = "update ObjectThin set objName =  concat('PSO J', \
    307307        lpad(floor(raMean/15.),2,'0'), \
    308308        lpad((raMean/15.-(floor(raMean/15.)))*60. ,2,'0'), \
Note: See TracChangeset for help on using the changeset viewer.