IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38397


Ignore:
Timestamp:
Jun 5, 2015, 5:09:21 PM (11 years ago)
Author:
heather
Message:

schema 21 / sas 39 ipptopsps - random now float/double, forced object column names changed to be less confusing

Location:
trunk/ippToPsps
Files:
109 added
16 edited

Legend:

Unmodified
Added
Removed

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

    r37763 r38397  
    115115        <DESCRIPTION>survey flag identifier</DESCRIPTION>
    116116      </FIELD>
    117       <FIELD name="randomDiffID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     117      <FIELD name="randomDiffID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    118118        <DESCRIPTION> random diff id</DESCRIPTION>
    119119      </FIELD>

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

    r38090 r38397  
    2727        <DESCRIPTION>Zone index</DESCRIPTION>
    2828      </FIELD>
    29       <FIELD name="randomDiffObjID" arraysize="1" datatype="long" unit="dimensionless" default="0">
     29      <FIELD name="randomDiffObjID" arraysize="1" datatype="double" unit="dimensionless" default="0">
    3030        <DESCRIPTION>Random integer between 0 and 2^32 = 4,394,967,296</DESCRIPTION>
    3131      </FIELD>

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

    r38215 r38397  
    4343        <DESCRIPTION>survey flag identifier</DESCRIPTION>
    4444      </FIELD>
    45       <FIELD name="randomForcedGalID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     45      <FIELD name="randomForcedGalID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    4646        <DESCRIPTION> random warp id</DESCRIPTION>
    4747      </FIELD>

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

    r38290 r38397  
    1515        <DESCRIPTION>IPP object number</DESCRIPTION>
    1616      </FIELD>
    17       <FIELD name="randomForcedObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     17      <FIELD name="randomForcedObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    1818        <DESCRIPTION>random id</DESCRIPTION>
    1919      </FIELD>
    … …  
    4545        <DESCRIPTION>number of detections included in robust mean of ApFlx 7 in g filter</DESCRIPTION>
    4646      </FIELD>     
    47       <FIELD name="gPSFFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     47      <FIELD name="gFPSFFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    4848        <DESCRIPTION> robust mean g psf AB magnitude (sigma clipping or MAP or go to 5 or 7 number summary? 1/12 is ~9th percentile</DESCRIPTION>
    4949      </FIELD>
    50       <FIELD name="gPSFFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     50      <FIELD name="gFPSFFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    5151        <DESCRIPTION> estimated error of g psf AB magnitude mean(individual errors added in quadrature)</DESCRIPTION>
    5252      </FIELD>
    53       <FIELD name="gPSFFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    54         <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    55       </FIELD>
    56       <FIELD name="gKronFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     53      <FIELD name="gFPSFFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     54        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
     55      </FIELD>
     56      <FIELD name="gFKronFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    5757        <DESCRIPTION>mean g kron AB magnitude</DESCRIPTION>
    5858      </FIELD>
    59       <FIELD name="gKronFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     59      <FIELD name="gFKronFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    6060        <DESCRIPTION> estimated error of g kron AB magnitude mean</DESCRIPTION>
    6161      </FIELD>
    62       <FIELD name="gKronFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    63         <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    64       </FIELD>
    65       <FIELD name="gApFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     62      <FIELD name="gFKronFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     63        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
     64      </FIELD>
     65      <FIELD name="gFApFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    6666        <DESCRIPTION>mean g aperture AB magnitude</DESCRIPTION>
    6767      </FIELD>
    68       <FIELD name="gApFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     68      <FIELD name="gFApFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    6969        <DESCRIPTION> estimated error of g aperture AB magnitude mean</DESCRIPTION>
    7070      </FIELD>
    71       <FIELD name="gApFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     71      <FIELD name="gFApFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    7272        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    7373      </FIELD>
    … …  
    141141        <DESCRIPTION>number of detections included in robust mean of ApFlx 7 in r filter</DESCRIPTION>
    142142      </FIELD>
    143       <FIELD name="rPSFFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     143      <FIELD name="rFPSFFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    144144        <DESCRIPTION> robust mean r psf AB magnitude (sigma clipping or MAP or go to 5 or 7 number summary? 1/12 is ~9th percentile</DESCRIPTION>
    145145      </FIELD>
    146       <FIELD name="rPSFFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     146      <FIELD name="rFPSFFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    147147        <DESCRIPTION> estimated error of g psf AB magnitude mean(individual errors added in quadrature)</DESCRIPTION>
    148148      </FIELD>
    149       <FIELD name="rPSFFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    150         <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    151       </FIELD>
    152       <FIELD name="rKronFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     149      <FIELD name="rFPSFFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     150        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
     151      </FIELD>
     152      <FIELD name="rFKronFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    153153        <DESCRIPTION>mean r kron AB magnitude</DESCRIPTION>
    154154      </FIELD>
    155       <FIELD name="rKronFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     155      <FIELD name="rFKronFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    156156        <DESCRIPTION> estimated error of r kron AB magnitude mean</DESCRIPTION>
    157157      </FIELD>
    158       <FIELD name="rKronFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    159         <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    160       </FIELD>
    161       <FIELD name="rApFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     158      <FIELD name="rFKronFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     159        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
     160      </FIELD>
     161      <FIELD name="rFApFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    162162        <DESCRIPTION>mean r aperture AB magnitude</DESCRIPTION>
    163163      </FIELD>
    164       <FIELD name="rApFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     164      <FIELD name="rFApFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    165165        <DESCRIPTION> estimated error of r aperture AB magnitude mean</DESCRIPTION>
    166166      </FIELD>
    167       <FIELD name="rApFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     167      <FIELD name="rFApFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    168168        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    169169      </FIELD>
    … …  
    238238        <DESCRIPTION>number of detections included in robust mean of ApFlx 7 in i filter</DESCRIPTION>
    239239      </FIELD>     
    240       <FIELD name="iPSFFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     240      <FIELD name="iFPSFFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    241241        <DESCRIPTION> robust mean i psf AB magnitude (sigma clipping or MAP or go to 5 or 7 number summary? 1/12 is ~9th percentile</DESCRIPTION>
    242242      </FIELD>
    243       <FIELD name="iPSFFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     243      <FIELD name="iFPSFFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    244244        <DESCRIPTION> estimated error of i psf AB magnitude mean(individual errors added in quadrature)</DESCRIPTION>
    245245      </FIELD>
    246       <FIELD name="iPSFFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    247         <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    248       </FIELD>
    249       <FIELD name="iKronFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     246      <FIELD name="iFPSFFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     247        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
     248      </FIELD>
     249      <FIELD name="iFKronFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    250250        <DESCRIPTION>mean i kron AB magnitude</DESCRIPTION>
    251251      </FIELD>
    252       <FIELD name="iKronFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     252      <FIELD name="iFKronFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    253253        <DESCRIPTION> estimated error of i kron AB magnitude mean</DESCRIPTION>
    254254      </FIELD>
    255       <FIELD name="iKronFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    256         <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    257       </FIELD>
    258       <FIELD name="iApFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     255      <FIELD name="iFKronFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     256        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
     257      </FIELD>
     258      <FIELD name="iFApFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    259259        <DESCRIPTION>mean i aperture AB magnitude</DESCRIPTION>
    260260      </FIELD>
    261       <FIELD name="iApFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     261      <FIELD name="iFApFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    262262        <DESCRIPTION> estimated error of i aperture AB magnitude mean</DESCRIPTION>
    263263      </FIELD>
    264       <FIELD name="iApFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     264      <FIELD name="iFApFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    265265        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    266266      </FIELD>
    … …  
    334334        <DESCRIPTION>number of detections included in robust mean of ApFlx 7 in z filter</DESCRIPTION>
    335335      </FIELD>
    336       <FIELD name="zPSFFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     336      <FIELD name="zFPSFFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    337337        <DESCRIPTION> robust mean z psf AB magnitude (sigma clipping or MAP or go to 5 or 7 number summary? 1/12 is ~9th percentile</DESCRIPTION>
    338338      </FIELD>
    339       <FIELD name="zPSFFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     339      <FIELD name="zFPSFFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    340340        <DESCRIPTION> estimated error of z psf AB magnitude mean(individual errors added in quadrature)</DESCRIPTION>
    341341      </FIELD>
    342       <FIELD name="zPSFFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    343         <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    344       </FIELD>
    345       <FIELD name="zKronFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     342      <FIELD name="zFPSFFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     343        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
     344      </FIELD>
     345      <FIELD name="zFKronFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    346346        <DESCRIPTION>mean z kron AB magnitude</DESCRIPTION>
    347347      </FIELD>
    348       <FIELD name="zKronFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     348      <FIELD name="zFKronFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    349349        <DESCRIPTION> estimated error of z kron AB magnitude mean</DESCRIPTION>
    350350      </FIELD>
    351       <FIELD name="zKronFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    352         <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    353       </FIELD>
    354       <FIELD name="zApFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     351      <FIELD name="zFKronFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     352        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
     353      </FIELD>
     354      <FIELD name="zFApFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    355355        <DESCRIPTION>mean z aperture AB magnitude</DESCRIPTION>
    356356      </FIELD>
    357       <FIELD name="zApFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     357      <FIELD name="zFApFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    358358        <DESCRIPTION> estimated error of z aperture AB magnitude mean</DESCRIPTION>
    359359      </FIELD>
    360       <FIELD name="zApFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     360      <FIELD name="zFApFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    361361        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    362362      </FIELD>
    … …  
    431431        <DESCRIPTION>number of detections included in robust mean of ApFlx 7 in y filter</DESCRIPTION>
    432432      </FIELD>
    433       <FIELD name="yPSFFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     433      <FIELD name="yFPSFFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    434434        <DESCRIPTION> robust mean y psf AB magnitude (sigma clipping or MAP or go to 5 or 7 number summary? 1/12 is ~9th percentile</DESCRIPTION>
    435435      </FIELD>
    436       <FIELD name="yPSFFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     436      <FIELD name="yFPSFFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    437437        <DESCRIPTION> estimated error of y psf AB magnitude mean(individual errors added in quadrature)</DESCRIPTION>
    438438      </FIELD>
    439       <FIELD name="yPSFFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    440         <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    441       </FIELD>
    442       <FIELD name="yKronFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     439      <FIELD name="yFPSFFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     440        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
     441      </FIELD>
     442      <FIELD name="yFKronFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    443443        <DESCRIPTION>mean y kron AB magnitude</DESCRIPTION>
    444444      </FIELD>
    445       <FIELD name="yKronFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     445      <FIELD name="yFKronFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    446446        <DESCRIPTION> estimated error of y kron AB magnitude mean</DESCRIPTION>
    447447      </FIELD>
    448       <FIELD name="yKronFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    449         <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    450       </FIELD>
    451       <FIELD name="yApFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     448      <FIELD name="yFKronFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     449        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
     450      </FIELD>
     451      <FIELD name="yFApFlux" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    452452        <DESCRIPTION>mean y aperture AB magnitude</DESCRIPTION>
    453453      </FIELD>
    454       <FIELD name="yApFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
     454      <FIELD name="yFApFluxErr" arraysize="1" datatype="float" unit="AB magnitude" default="-999">
    455455        <DESCRIPTION> estimated error of y aperture AB magnitude mean</DESCRIPTION>
    456456      </FIELD>
    457       <FIELD name="yApFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     457      <FIELD name="yFApFluxStd" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    458458        <DESCRIPTION>standard deviation of measurements included in the robust mean</DESCRIPTION>
    459459      </FIELD>
    … …  
    522522        <DESCRIPTION>IPP object number</DESCRIPTION>
    523523      </FIELD>
    524       <FIELD name="randomForcedObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     524      <FIELD name="randomForcedObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    525525        <DESCRIPTION>random number</DESCRIPTION>
    526526      </FIELD>

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

    r38215 r38397  
    139139        <DESCRIPTION>forced warp measurement meta identifer</DESCRIPTION>
    140140      </FIELD>
    141       <FIELD name="randomWarpID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     141      <FIELD name="randomWarpID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    142142        <DESCRIPTION> random warp id</DESCRIPTION>
    143143      </FIELD>
    … …  
    285285        <DESCRIPTION>forced warp measurement meta identifer</DESCRIPTION>
    286286      </FIELD>
    287       <FIELD name="randomWarpID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     287      <FIELD name="randomWarpID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    288288        <DESCRIPTION> random warp id</DESCRIPTION>
    289289      </FIELD>
    … …  
    364364        <DESCRIPTION>forced warp measurement meta identifer</DESCRIPTION>
    365365      </FIELD>
    366       <FIELD name="randomWarpID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     366      <FIELD name="randomWarpID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    367367        <DESCRIPTION> random warp id</DESCRIPTION>
    368368      </FIELD>

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

    r38095 r38397  
    3636        <DESCRIPTION>skycell region identifier for primary stack detection</DESCRIPTION>
    3737      </FIELD>
    38       <FIELD name="randomID" arraysize="1" datatype="long" unit="dimensionless" default="0">
     38      <FIELD name="randomID" arraysize="1" datatype="double" unit="dimensionless" default="0">
    3939        <DESCRIPTION>Random integer between 0 and 2^32 - 4,394,967,296</DESCRIPTION>
    4040      </FIELD>

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

    r38224 r38397  
    404404        <DESCRIPTION>image id hash of frame identifier &amp; OTA/CCD number</DESCRIPTION>
    405405      </FIELD>
    406       <FIELD name="randomDetID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     406      <FIELD name="randomDetID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    407407        <DESCRIPTION> random detection Id</DESCRIPTION>
    408408      </FIELD>

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

    r37246 r38397  
    137137        <DESCRIPTION>single float giving PrimaryCell.SkyCell identifier</DESCRIPTION>
    138138      </FIELD>
    139       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     139      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    140140        <DESCRIPTION>random stack id</DESCRIPTION>
    141141      </FIELD>
    … …  
    459459        <DESCRIPTION>single float giving PrimaryCell.SkyCell identifier</DESCRIPTION>
    460460      </FIELD>
    461       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     461      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    462462        <DESCRIPTION>random stack id</DESCRIPTION>
    463463      </FIELD>
    … …  
    977977        <DESCRIPTION>single float giving PrimaryCell.SkyCell identifier</DESCRIPTION>
    978978      </FIELD>
    979       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     979      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    980980        <DESCRIPTION>random stack id</DESCRIPTION>
    981981      </FIELD>
    … …  
    16141614        <DESCRIPTION>single float giving PrimaryCell.SkyCell identifier</DESCRIPTION>
    16151615      </FIELD>
    1616       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     1616      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    16171617        <DESCRIPTION>random stack id</DESCRIPTION>
    16181618      </FIELD>
    … …  
    16891689        <DESCRIPTION>single float giving PrimaryCell.SkyCell identifier</DESCRIPTION>
    16901690      </FIELD>
    1691       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     1691      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    16921692        <DESCRIPTION>random stack id</DESCRIPTION>
    16931693      </FIELD>
    … …  
    17851785        <DESCRIPTION>single float giving PrimaryCell.SkyCell identifier</DESCRIPTION>
    17861786      </FIELD>
    1787       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     1787      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    17881788        <DESCRIPTION>random stack id</DESCRIPTION>
    17891789      </FIELD>
    … …  
    18811881        <DESCRIPTION>single float giving PrimaryCell.SkyCell identifier</DESCRIPTION>
    18821882      </FIELD>
    1883       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     1883      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    18841884        <DESCRIPTION>random stack id</DESCRIPTION>
    18851885      </FIELD>
    … …  
    19831983        <DESCRIPTION>single float giving PrimaryCell.SkyCell identifier</DESCRIPTION>
    19841984      </FIELD>
    1985       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     1985      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    19861986        <DESCRIPTION>random stack id</DESCRIPTION>
    19871987      </FIELD>
    … …  
    21572157        <DESCRIPTION>single float giving PrimaryCell.SkyCell identifier</DESCRIPTION>
    21582158      </FIELD>
    2159       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     2159      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    21602160        <DESCRIPTION>random stack id</DESCRIPTION>
    21612161      </FIELD>
    … …  
    23312331        <DESCRIPTION>single float giving PrimaryCell.SkyCell identifier</DESCRIPTION>
    23322332      </FIELD>
    2333       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     2333      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    23342334        <DESCRIPTION>random stack id</DESCRIPTION>
    23352335      </FIELD>
    … …  
    25052505        <DESCRIPTION>single float giving PrimaryCell.SkyCell identifier</DESCRIPTION>
    25062506      </FIELD>
    2507       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     2507      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    25082508        <DESCRIPTION>random stack id</DESCRIPTION>
    25092509      </FIELD>

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

    r38095 r38397  
    149149        <DESCRIPTION>skycell region identifier</DESCRIPTION>
    150150      </FIELD>
    151       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     151      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    152152        <DESCRIPTION>random for stack detections (not the same as random objid)</DESCRIPTION>
    153153      </FIELD>
    … …  
    434434        <DESCRIPTION>IPP object identifier</DESCRIPTION>
    435435      </FIELD>
    436       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     436      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    437437        <DESCRIPTION>random stack id</DESCRIPTION>
    438438      </FIELD>
    … …  
    982982        <DESCRIPTION>IPP object identifier</DESCRIPTION>
    983983      </FIELD>
    984       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     984      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    985985        <DESCRIPTION>random stack id</DESCRIPTION>
    986986      </FIELD>
    … …  
    16071607        <DESCRIPTION>IPP object identifier</DESCRIPTION>
    16081608      </FIELD>
    1609       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     1609      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    16101610        <DESCRIPTION>random stack id</DESCRIPTION>
    16111611      </FIELD>
    … …  
    17981798        <DESCRIPTION>IPP object identifier</DESCRIPTION>
    17991799      </FIELD>
    1800       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     1800      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    18011801        <DESCRIPTION>random stack id</DESCRIPTION>
    18021802      </FIELD>
    … …  
    20942094        <DESCRIPTION>IPP object identifier</DESCRIPTION>
    20952095      </FIELD>
    2096       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     2096      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    20972097        <DESCRIPTION>random stack id</DESCRIPTION>
    20982098      </FIELD>
    … …  
    23902390        <DESCRIPTION>IPP object identifier</DESCRIPTION>
    23912391      </FIELD>
    2392       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     2392      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    23932393        <DESCRIPTION>random stack id</DESCRIPTION>
    23942394      </FIELD>
    … …  
    27162716        <DESCRIPTION>IPP object identifier</DESCRIPTION>
    27172717      </FIELD>
    2718       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     2718      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    27192719        <DESCRIPTION>random stack id</DESCRIPTION>
    27202720      </FIELD>
    … …  
    33403340        <DESCRIPTION>IPP object identifier</DESCRIPTION>
    33413341      </FIELD>
    3342       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     3342      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    33433343        <DESCRIPTION>random stack id</DESCRIPTION>
    33443344      </FIELD>
    … …  
    39633963        <DESCRIPTION>IPP object identifier</DESCRIPTION>
    39643964      </FIELD>
    3965       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     3965      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    39663966        <DESCRIPTION>random stack id</DESCRIPTION>
    39673967      </FIELD>
    … …  
    45874587        <DESCRIPTION>IPP object identifier</DESCRIPTION>
    45884588      </FIELD>
    4589       <FIELD name="randomStackObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     4589      <FIELD name="randomStackObjID" arraysize="1" datatype="double" unit="dimensionless" default="NA">
    45904590        <DESCRIPTION>random stack id</DESCRIPTION>
    45914591      </FIELD>

  • trunk/ippToPsps/jython/detectionbatch.py

    r38290 r38397  
    412412
    413413        sqlLine.group("ippDetectID",     "IPP_IDET")                                               
    414         sqlLine.group("randomDetID",     "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")                       
     414#        sqlLine.group("randomDetID",     "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")                       
     415        sqlLine.group("randomDetID",     "(RAND("+str(self.batchID)+")")                       
    415416        sqlLine.group("filterID",        str(self.filterID))                                       
    416417        sqlLine.group("surveyID",        str(self.surveyID))                                       

  • trunk/ippToPsps/jython/diffbatch.py

    r38358 r38397  
    271271        sqlLine.group("ippDetectID",     "IPP_IDET")
    272272        sqlLine.group("diffDetMetaID",            str(diffSkyFileID));                                               
    273         sqlLine.group("randomDiffID",     "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")                       
     273
     274#        sqlLine.group("randomDiffID",     "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")                       
     275        sqlLine.group("randomDiffID",     "RAND("+str(self.batchID)+")")                       
    274276        sqlLine.group("filterID",        str(self.filterID[num]))                                       
    275277        sqlLine.group("surveyID",        str(self.surveyID))         

  • trunk/ippToPsps/jython/diffobjectbatch.py

    r38090 r38397  
    288288        sqlLine.group("ippObjID",        "OBJ_ID + (CAT_ID << 32)") # NOTE: shift by 32 bits exactly
    289289        sqlLine.group("surveyID",        "'" + str(self.surveyID) + "'")
    290         sqlLine.group("randomDiffObjID",        "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)") # XXX where does this number come from??
     290        sqlLine.group("randomDiffObjID",        "RAND("+str(self.batchID)+")") # XXX where does this number come from??
    291291        sqlLine.group("batchID",         "'" + str(self.batchID) + "'")
    292292        sqlLine.group("dvoRegionID",     "CAT_ID")

  • trunk/ippToPsps/jython/forcedobjectbatch.py

    r38290 r38397  
    173173                   ,ForcedMeanObject." + filter[1] + "nIncKronFlux    = NUSED_KRON_WRP \
    174174                   ,ForcedMeanObject." + filter[1] + "nIncApFlux      = NUSED_AP_WRP \
    175                    ,ForcedMeanObject." + filter[1] + "PSFFlux         = FLUX_PSF_WRP \
    176                    ,ForcedMeanObject." + filter[1] + "PSFFluxErr      = FLUX_PSF_WRP_ERR \
    177                    ,ForcedMeanObject." + filter[1] + "PSFFluxStd      = FLUX_PSF_WRP_STDEV \
    178                    ,ForcedMeanObject." + filter[1] + "KronFlux        = FLUX_KRON_WRP \
    179                    ,ForcedMeanObject." + filter[1] + "KronFluxErr     = FLUX_KRON_WRP_ERR \
    180                    ,ForcedMeanObject." + filter[1] + "KronFluxStd     = FLUX_KRON_WRP_STDEV \
    181                    ,ForcedMeanObject." + filter[1] + "ApFlux          = FLUX_AP_WRP \
    182                    ,ForcedMeanObject." + filter[1] + "ApFluxErr       = FLUX_AP_WRP_ERR \
    183                    ,ForcedMeanObject." + filter[1] + "ApFluxStd       = FLUX_AP_WRP_STDEV \
     175                   ,ForcedMeanObject." + filter[1] + "FPSFFlux         = FLUX_PSF_WRP \
     176                   ,ForcedMeanObject." + filter[1] + "FPSFFluxErr      = FLUX_PSF_WRP_ERR \
     177                   ,ForcedMeanObject." + filter[1] + "FPSFFluxStd      = FLUX_PSF_WRP_STDEV \
     178                   ,ForcedMeanObject." + filter[1] + "FKronFlux        = FLUX_KRON_WRP \
     179                   ,ForcedMeanObject." + filter[1] + "FKronFluxErr     = FLUX_KRON_WRP_ERR \
     180                   ,ForcedMeanObject." + filter[1] + "FKronFluxStd     = FLUX_KRON_WRP_STDEV \
     181                   ,ForcedMeanObject." + filter[1] + "FApFlux          = FLUX_AP_WRP \
     182                   ,ForcedMeanObject." + filter[1] + "FApFluxErr       = FLUX_AP_WRP_ERR \
     183                   ,ForcedMeanObject." + filter[1] + "FApFluxStd       = FLUX_AP_WRP_STDEV \
    184184                   ,ForcedMeanObject." + filter[1] + "Flags          = FLAGS "
    185185
    … …  
    333333        sqlLine.group("ippObjID",        "OBJ_ID + (CAT_ID << 32)") # NOTE: shift by 32 bits exactly
    334334        sqlLine.group("batchID",         "'" + str(self.batchID) + "'")
    335         sqlLine.group("randomForcedObjID",        "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")
     335        sqlLine.group("randomForcedObjID",        "RAND("+str(self.batchID)+")")
    336336        sqlLine.group("nDetections",      "'0'")
    337337        sql = sqlLine.makeRaw(") SELECT ", " FROM " + cptTableName)

  • trunk/ippToPsps/jython/forcedwarpbatch.py

    r38358 r38397  
    340340        sqlLine.group("forcedWarpID",            str(forcedWarpID))
    341341        print " got here too, num", num
    342         sqlLine.group("randomWarpID",     "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")
     342        sqlLine.group("randomWarpID",     "RAND("+str(self.batchID)+")")
    343343        print "here" 
    344344        sqlLine.group("filterID",        str(self.filterID[num]))
    … …  
    676676
    677677    def generateRandomIDs(self,forcedWarpID):
    678         sql = "UPDATE ForcedWarpMeasurement_"+forcedWarpID+" set randomWarpID = FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)"
     678        sql = "UPDATE ForcedWarpMeasurement_"+forcedWarpID+" set randomWarpID = RAND("+str(self.batchID)+")"
    679679        try:
    680680            self.scratchDb.execute(sql)

  • trunk/ippToPsps/jython/objectbatch.py

    r37935 r38397  
    364364        sqlLine.group("ippObjID",        "OBJ_ID + (CAT_ID << 32)") # NOTE: shift by 32 bits exactly
    365365        sqlLine.group("surveyID",        "'" + str(self.surveyID) + "'")
    366         sqlLine.group("randomID",        "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)") # XXX where does this number come from??
     366        sqlLine.group("randomID",        "RAND("+str(self.batchID)+")") # XXX where does this number come from??
    367367        sqlLine.group("batchID",         "'" + str(self.batchID) + "'")
    368368        sqlLine.group("dvoRegionID",     "CAT_ID")

  • trunk/ippToPsps/jython/stackbatch.py

    r38365 r38397  
    10441044
    10451045    def generateRandomIDs(self):
    1046         sql = "UPDATE StackObjectThin set randomStackObjID = FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)"
     1046        sql = "UPDATE StackObjectThin set randomStackObjID = RAND("+str(self.batchID)+")"
    10471047        try: self.scratchDb.execute(sql)
    10481048        except:
Note: See TracChangeset for help on using the changeset viewer.