IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37200


Ignore:
Timestamp:
Aug 7, 2014, 6:21:58 AM (12 years ago)
Author:
eugene
Message:

add platescale; fix ra,dec; change likelihood to chisq (for now)

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

Legend:

Unmodified
Added
Removed

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

    r37190 r37200  
    512512        <DESCRIPTION>zero point offset</DESCRIPTION>
    513513      </FIELD>
     514      <FIELD name="gPlateScale" arraysize="1" datatype="float" unit="arcsec/pixel" default="0">
     515        <DESCRIPTION>plate scale</DESCRIPTION>
     516      </FIELD>
    514517      <FIELD name="gexpTime" arraysize="1" datatype="float" unit="seconds" default="-999">
    515518        <DESCRIPTION>exposure time (informational)</DESCRIPTION>
    … …  
    607610        <DESCRIPTION>zero point offset</DESCRIPTION>
    608611      </FIELD>
     612      <FIELD name="rPlateScale" arraysize="1" datatype="float" unit="arcsec/pixel" default="0">
     613        <DESCRIPTION>plate scale</DESCRIPTION>
     614      </FIELD>
    609615      <FIELD name="rexpTime" arraysize="1" datatype="float" unit="seconds" default="-999">
    610616        <DESCRIPTION>exposure time (informational)</DESCRIPTION>
    … …  
    702708        <DESCRIPTION>zero point offset</DESCRIPTION>
    703709      </FIELD>
     710      <FIELD name="iPlateScale" arraysize="1" datatype="float" unit="arcsec/pixel" default="0">
     711        <DESCRIPTION>plate scale</DESCRIPTION>
     712      </FIELD>
    704713      <FIELD name="iexpTime" arraysize="1" datatype="float" unit="seconds" default="-999">
    705714        <DESCRIPTION>exposure time (informational)</DESCRIPTION>
    … …  
    797806        <DESCRIPTION>zero point offset</DESCRIPTION>
    798807      </FIELD>
     808      <FIELD name="zPlateScale" arraysize="1" datatype="float" unit="arcsec/pixel" default="0">
     809        <DESCRIPTION>plate scale</DESCRIPTION>
     810      </FIELD>
    799811      <FIELD name="zexpTime" arraysize="1" datatype="float" unit="seconds" default="-999">
    800812        <DESCRIPTION>exposure time (informational)</DESCRIPTION>
    … …  
    891903      <FIELD name="yzp" arraysize="1" datatype="float" unit="magnitude" default="0">
    892904        <DESCRIPTION>zero point offset</DESCRIPTION>
     905      </FIELD>
     906      <FIELD name="yPlateScale" arraysize="1" datatype="float" unit="arcsec/pixel" default="0">
     907        <DESCRIPTION>plate scale</DESCRIPTION>
    893908      </FIELD>
    894909      <FIELD name="yexpTime" arraysize="1" datatype="float" unit="seconds" default="-999">
    … …  
    18491864        <DESCRIPTION>Exponential fit coverage factor</DESCRIPTION>
    18501865      </FIELD>
    1851       <FIELD name="gExpLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    1852         <DESCRIPTION>Exponential fit likelihood factor</DESCRIPTION>
     1866      <FIELD name="gExpChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     1867        <DESCRIPTION>Exponential fit chi square factor</DESCRIPTION>
    18531868      </FIELD>
    18541869
    … …  
    19021917        <DESCRIPTION>Exponential fit coverage factor</DESCRIPTION>
    19031918      </FIELD>
    1904       <FIELD name="rExpLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    1905         <DESCRIPTION>Exponential fit likelihood factor</DESCRIPTION>
     1919      <FIELD name="rExpChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     1920        <DESCRIPTION>Exponential fit chi square factor</DESCRIPTION>
    19061921      </FIELD>
    19071922
    … …  
    19551970        <DESCRIPTION>Exponential fit coverage factor</DESCRIPTION>
    19561971      </FIELD>
    1957       <FIELD name="iExpLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    1958         <DESCRIPTION>Exponential fit likelihood factor</DESCRIPTION>
     1972      <FIELD name="iExpChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     1973        <DESCRIPTION>Exponential fit chi square factor</DESCRIPTION>
    19591974      </FIELD>
    19601975
    … …  
    20082023        <DESCRIPTION>Exponential fit coverage factor</DESCRIPTION>
    20092024      </FIELD>
    2010       <FIELD name="zExpLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    2011         <DESCRIPTION>Exponential fit likelihood factor</DESCRIPTION>
     2025      <FIELD name="zExpChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     2026        <DESCRIPTION>Exponential fit chi square factor</DESCRIPTION>
    20122027      </FIELD>
    20132028
    … …  
    20612076        <DESCRIPTION>Exponential fit coverage factor</DESCRIPTION>
    20622077      </FIELD>
    2063       <FIELD name="yExpLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    2064         <DESCRIPTION>Exponential fit likelihood factor</DESCRIPTION>
     2078      <FIELD name="yExpChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     2079        <DESCRIPTION>Exponential fit chi square factor</DESCRIPTION>
    20652080      </FIELD>
    20662081
    … …  
    21422157        <DESCRIPTION>DeVaucouleurs fit coverage factor</DESCRIPTION>
    21432158      </FIELD>
    2144       <FIELD name="gDeVLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    2145         <DESCRIPTION>DeVaucouleurs fit likelihood factor</DESCRIPTION>
     2159      <FIELD name="gDeVChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     2160        <DESCRIPTION>DeVaucouleurs fit chi square factor</DESCRIPTION>
    21462161      </FIELD>
    21472162
    … …  
    21952210        <DESCRIPTION>DeVaucouleurs fit coverage factor</DESCRIPTION>
    21962211      </FIELD>
    2197       <FIELD name="rDeVLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    2198         <DESCRIPTION>DeVaucouleurs fit likelihood factor</DESCRIPTION>
     2212      <FIELD name="rDeVChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     2213        <DESCRIPTION>DeVaucouleurs fit chi square factor</DESCRIPTION>
    21992214      </FIELD>
    22002215
    … …  
    22482263        <DESCRIPTION>DeVaucouleurs fit coverage factor</DESCRIPTION>
    22492264      </FIELD>
    2250       <FIELD name="iDeVLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    2251         <DESCRIPTION>DeVaucouleurs fit likelihood factor</DESCRIPTION>
     2265      <FIELD name="iDeVChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     2266        <DESCRIPTION>DeVaucouleurs fit chi square factor</DESCRIPTION>
    22522267      </FIELD>
    22532268
    … …  
    23012316        <DESCRIPTION>DeVaucouleurs fit coverage factor</DESCRIPTION>
    23022317      </FIELD>
    2303       <FIELD name="zDeVLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    2304         <DESCRIPTION>DeVaucouleurs fit likelihood factor</DESCRIPTION>
     2318      <FIELD name="zDeVChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     2319        <DESCRIPTION>DeVaucouleurs fit chi square factor</DESCRIPTION>
    23052320      </FIELD>
    23062321
    … …  
    23542369        <DESCRIPTION>DeVaucouleurs fit coverage factor</DESCRIPTION>
    23552370      </FIELD>
    2356       <FIELD name="yDeVLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    2357         <DESCRIPTION>DeVaucouleurs fit likelihood factor</DESCRIPTION>
     2371      <FIELD name="yDeVChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     2372        <DESCRIPTION>DeVaucouleurs fit chi square factor</DESCRIPTION>
    23582373      </FIELD>
    23592374
    … …  
    24412456        <DESCRIPTION>Sersic fit coverage factor</DESCRIPTION>
    24422457      </FIELD>
    2443       <FIELD name="gSerLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    2444         <DESCRIPTION>Sersic fit likelihood factor</DESCRIPTION>
     2458      <FIELD name="gSerChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     2459        <DESCRIPTION>Sersic fit chi square factor</DESCRIPTION>
    24452460      </FIELD>
    24462461
    … …  
    25002515        <DESCRIPTION>Sersic fit coverage factor</DESCRIPTION>
    25012516      </FIELD>
    2502       <FIELD name="rSerLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    2503         <DESCRIPTION>Sersic fit likelihood factor</DESCRIPTION>
     2517      <FIELD name="rSerChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     2518        <DESCRIPTION>Sersic fit chi square factor</DESCRIPTION>
    25042519      </FIELD>
    25052520
    … …  
    25592574        <DESCRIPTION>Sersic fit coverage factor</DESCRIPTION>
    25602575      </FIELD>
    2561       <FIELD name="iSerLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    2562         <DESCRIPTION>Sersic fit likelihood factor</DESCRIPTION>
     2576      <FIELD name="iSerChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     2577        <DESCRIPTION>Sersic fit chi square factor</DESCRIPTION>
    25632578      </FIELD>
    25642579
    … …  
    26182633        <DESCRIPTION>Sersic fit coverage factor</DESCRIPTION>
    26192634      </FIELD>
    2620       <FIELD name="zSerLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    2621         <DESCRIPTION>Sersic fit likelihood factor</DESCRIPTION>
     2635      <FIELD name="zSerChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     2636        <DESCRIPTION>Sersic fit chi square factor</DESCRIPTION>
    26222637      </FIELD>
    26232638
    … …  
    26772692        <DESCRIPTION>Sersic fit coverage factor</DESCRIPTION>
    26782693      </FIELD>
    2679       <FIELD name="ySerLikelihood" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    2680         <DESCRIPTION>Sersic fit likelihood factor</DESCRIPTION>
     2694      <FIELD name="ySerChisq" arraysize="1" datatype="float" unit="dimensionless" default="-999">
     2695        <DESCRIPTION>Sersic fit chi square</DESCRIPTION>
    26812696      </FIELD>
    26822697

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

    r37191 r37200  
    428428            sqlLine.group("a."+filter+"ApRadius",      "b.AP_MAG_RADIUS")
    429429            sqlLine.group("a."+filter+"KronRad",       "b.MOMENTS_R1 * 2.5")
     430            sqlLine.group("a."+filter+"PlateScale",    "b.PLTSCALE")
    430431
    431432            sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID = b.IPP_IDET")
    … …  
    519520                     
    520521        sqlLine.group("a." + filter + model + "Radius",    "b.EXT_WIDTH_MAJ")
    521         sqlLine.group("a." + filter + model + "Ab",        "b.EXT_WIDTH_MAJ/b.EXT_WIDTH_MIN")
    522         sqlLine.group("a." + filter + model + "Phi",       "b.EXT_THETA")
     522        sqlLine.group("a." + filter + model + "Ab",        "b.EXT_WIDTH_MIN/b.EXT_WIDTH_MAJ")
     523        sqlLine.group("a." + filter + model + "Phi",       "DEGREES(b.EXT_THETA)")
    523524
    524525        sqlLine.group("a." + filter + model + "RadiusErr", "b.EXT_WIDTH_MAJ_ERR") # these are not correctly defined.
    … …  
    526527        sqlLine.group("a." + filter + model + "PhiErr",    "b.EXT_THETA_ERR") # these are not correctly defined.
    527528
     529        sqlLine.group("a." + filter + model + "Chisq",     "b.EXT_CHISQ / b.EXT_NDOF")
     530
     531        # I have raExp = X_EXT
     532
    528533        # XXX this is tricky: RA_EXT is not defined, but X_EXT is...
    529         # sqlLine.group("a." + filter + model + "RaOff",     "b.X_EXT")
    530         # sqlLine.group("a." + filter + model + "DecOff",    "b.Y_EXT")
    531         # sqlLine.group("a." + filter + model + "RaErr",     "b.X_EXT_SIG * b.PLTSCALE")
    532         # sqlLine.group("a." + filter + model + "DecErr",    "b.Y_EXT_SIG * b.PLTSCALE")
     534        sqlLine.group("a." + filter + model + "Ra",        "b.X_EXT")
     535        sqlLine.group("a." + filter + model + "Dec",       "b.Y_EXT")
     536        sqlLine.group("a." + filter + model + "RaErr",     "b.X_EXT_SIG") # need to modify by platescale
     537        sqlLine.group("a." + filter + model + "DecErr",    "b.Y_EXT_SIG")
    533538
    534539        # sersic fit has an extra parameter
    … …  
    547552
    548553        # insert detection information for each filter based on the DVO contents
     554        # XXX since I already have extracted StackObjectRaw, this is probably faster using that table:
    549555        sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + self.scratchDb.dvoDetectionTable + " as b SET")
    550556        sqlLine.group("a." + filter + model + "Mag",       "a." + filter + model + "Mag + b.zp")
    551557        sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID")
     558
     559        self.logger.infoPair('sql', sql)     
     560        try:
     561            self.scratchDb.execute(sql)
     562        except:
     563            self.logger.errorPair('failed sql',sql)
     564            return
     565
     566        # we have (modulo signs):
     567        # gRaExp  = gra  + (X_EXT - gxPos)*gPlateScale / cos(gdec)
     568        # gDecExp = gdec + (Y_EXT - gyPos)*gPlateScale
     569
     570        rawS  = "c." + filter + "PlateScale"
     571
     572        extR  = "a." + filter + model + "Ra"
     573        rawR  = "b." + filter + "ra"
     574        rawX  = "c." + filter + "xPos"
     575
     576        extD  = "a." + filter + model + "Dec"
     577        rawD  = "b." + filter + "dec"
     578        rawY  = "c." + filter + "yPos"
     579
     580        # dRA / dX = -PlateScale
     581        # b.+filter+ra  - (a.+filter+model+Ra - c.+filter+xPos)*c.+filter+PlateScale / cos(+filter+dec)
     582        # extR = rawR - (extR - rawX)*rawS / 3600.0 / cos(rawD)
     583
     584        # dDEC / dY = +PlateScale
     585        # b.+filter+dec + (a.+filter+model+Dec - c.+filter+xPos)*c.+filter+PlateScale / cos(+filter+dec)
     586        # extD = rawD + (extD - rawY)*rawS / 3600.0
     587
     588        # insert detection information for each filter based on the DVO contents
     589        sqlLine = sqlUtility("UPDATE " + tablename + " AS a, StackObjectThin as b, StackObjectRaw as c SET ")
     590        sqlLine.group(extR, rawR + " - (" + extR + " - " + rawX + ")*" + rawS + " / 3600.0 / cos(radians(" + rawD + "))")
     591        sqlLine.group(extD, rawD + " + (" + extD + " - " + rawY + ")*" + rawS + " / 3600.0")
     592        field = "a." + filter + model + "RaErr"
     593        sqlLine.group(field, field + "*" + rawS)
     594        field = "a." + filter + model + "DecErr"
     595        sqlLine.group(field, field + "*" + rawS)
     596        sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a.objID = c.objID")
    552597
    553598        self.logger.infoPair('sql', sql)     
    … …  
    760805        self.scratchDb.execute(sql)
    761806
     807        # instrumental flux, AB mags, Jy:
     808        # flux_inst = cts / sec
     809        # mag_AB = -2.5*log(flux_inst) + ZP [with appropriate definition of zero point]
     810        # mag_AB = -2.5*log(flux_cgs) - 48.6 [by construction with ~Vega flux in V-band]
     811        # flux_cgs = ten(-0.4*(mag_AB + 48.6))
     812        # flux_cgs = ten(-0.4*((-2.5*log(flux_inst) + ZP) + 48.6))
     813        # flux_cgs = flux_inst * ten(-0.4*(ZP + 48.6))
     814        # flux_Jy  = flux_cgs * 10^23
     815        # flux_Jy  = flux_inst * ten(-0.4*(ZP + 48.6) + 23.0)  [23.0 - 0.4*48.6 = 3.56]
     816        # flux_Jy  = flux_inst * ten(-0.4*ZP + 3.56)
     817        # flux_Jy  = flux_inst * ten(-0.4*ZP) * 3630.78
     818
    762819        # modify flux to apply the zero point
    763         # sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + self.scratchDb.dvoDetectionTable + " as b SET")
    764         # field = filter + prefix + "flxR" + number
    765         # sqlLine.group(field,               field         + " * POW(10, 3.56 - 0.4* b.zp)")
    766         # sqlLine.group(field + "Err",       field + "err" + " * POW(10, 3.56 - 0.4* b.zp)")
    767         # sqlLine.group(field + "Std",       field + "Std" + " * POW(10, 3.56 - 0.4* b.zp)")
    768         # sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID")
     820        sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + self.scratchDb.dvoDetectionTable + " as b SET")
     821        for number in numbers:
     822            field = filter + prefix + "flxR" + number
     823            sqlLine.group(field,               field         + " * POW(10, 3.56 - 0.4* b.zp)")
     824            sqlLine.group(field + "Err",       field + "err" + " * POW(10, 3.56 - 0.4* b.zp)")
     825            sqlLine.group(field + "Std",       field + "Std" + " * POW(10, 3.56 - 0.4* b.zp)")
     826        sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID")
    769827
    770828    '''

  • branches/eam_branches/ipp-20140717/ippToPsps/test/sascheck.v1.sql

    r37192 r37200  
    4040       join StackApFlxFullC1 using (gippDetectID)
    4141       join StackApFlxFullC2 using (gippDetectID)
    42        where (gippDetectID = 189)
     42       -- where (gippDetectID = 189)
    4343       -- where (gpsfQfPerfect > 0.85)
    4444       limit 50
Note: See TracChangeset for help on using the changeset viewer.