IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38090


Ignore:
Timestamp:
Apr 6, 2015, 4:38:40 PM (11 years ago)
Author:
heather
Message:

shcema20 first

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippScripts/scripts/addstar_run.pl

    r37739 r38090  
    102102
    103103if ($stage =~/fullforce/) {
     104    $reduction='DEFAULT';
     105    #hardwired because why not
     106}
     107if ($stage =~/diff/) {
    104108    $reduction='DEFAULT';
    105109    #hardwired because why not

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

    r37763 r38090  
    2121        <DESCRIPTION>Survey ID</DESCRIPTION>
    2222      </FIELD>
    23       <FIELD name="skyCellID" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    24         <DESCRIPTION>single float giving PrimaryCell.SkyCell identifier</DESCRIPTION>
    25       </FIELD>
    2623      <FIELD name="htmID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    2724        <DESCRIPTION>HTM index</DESCRIPTION>
    … …  
    3027        <DESCRIPTION>Zone index</DESCRIPTION>
    3128      </FIELD>
    32       <FIELD name="randomID" arraysize="1" datatype="long" unit="dimensionless" default="0">
     29      <FIELD name="randomDiffObjID" arraysize="1" datatype="long" unit="dimensionless" default="0">
    3330        <DESCRIPTION>Random integer between 0 and 2^32 = 4,394,967,296</DESCRIPTION>
    3431      </FIELD>

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

    r37927 r38090  
    1515        <DESCRIPTION>IPP object number</DESCRIPTION>
    1616      </FIELD>
     17      <FIELD name="randomForcedObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     18        <DESCRIPTION>random id</DESCRIPTION>
     19      </FIELD>
    1720      <FIELD name="nDetections" arraysize="1" datatype="short" unit="dimensionless" default="-999">
    1821        <DESCRIPTION>total number of detection measurements in all filters</DESCRIPTION>
    … …  
    2124        <DESCRIPTION>batch id</DESCRIPTION>
    2225      </FIELD>
    23       <FIELD name="gStackID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    24         <DESCRIPTION>stack image id (how to carry through IPP+DVO</DESCRIPTION>
    25       </FIELD>
    2626      <FIELD name="gnTotal" arraysize="1" datatype="short" unit="dimensionless" default="-999">
    2727        <DESCRIPTION>number of detections in g filter</DESCRIPTION>
    … …  
    105105        <DESCRIPTION>polarization, KSB-corrected 2Mxy / (Mxx + Myy)</DESCRIPTION>
    106106      </FIELD>
    107       <FIELD name="rStackID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    108         <DESCRIPTION>stack image id (how to carry through IPP+DVO</DESCRIPTION>
    109       </FIELD>
    110107      <FIELD name="rnTotal" arraysize="1" datatype="short" unit="dimensionless" default="-999">
    111108        <DESCRIPTION>number of detections in r filter</DESCRIPTION>
    … …  
    189186        <DESCRIPTION>polarization, KSB-corrected 2Mxy / (Mxx + Myy)</DESCRIPTION>
    190187      </FIELD>
    191       <FIELD name="iStackID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    192         <DESCRIPTION>stack image id (how to carry through IPP+DVO</DESCRIPTION>
    193       </FIELD>
    194188      <FIELD name="inTotal" arraysize="1" datatype="short" unit="dimensionless" default="-999">
    195189        <DESCRIPTION>number of detections in i filter</DESCRIPTION>
    … …  
    273267        <DESCRIPTION>polarization, KSB-corrected 2Mxy / (Mxx + Myy)</DESCRIPTION>
    274268      </FIELD>
    275       <FIELD name="zStackID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    276         <DESCRIPTION>stack image id (how to carry through IPP+DVO</DESCRIPTION>
    277       </FIELD>
    278269      <FIELD name="znTotal" arraysize="1" datatype="short" unit="dimensionless" default="-999">
    279270        <DESCRIPTION>number of detections in z filter</DESCRIPTION>
    … …  
    356347      <FIELD name="zE2" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    357348        <DESCRIPTION>polarization, KSB-corrected 2Mxy / (Mxx + Myy)</DESCRIPTION>
    358       </FIELD>
    359       <FIELD name="yStackID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    360         <DESCRIPTION>stack image id (how to carry through IPP+DVO</DESCRIPTION>
    361349      </FIELD>
    362350      <FIELD name="ynTotal" arraysize="1" datatype="short" unit="dimensionless" default="-999">
    … …  
    457445        <DESCRIPTION>IPP object number</DESCRIPTION>
    458446      </FIELD>
     447      <FIELD name="randomForcedObjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
     448        <DESCRIPTION>random number</DESCRIPTION>
     449      </FIELD>
    459450      <FIELD name="nDetections" arraysize="1" datatype="short" unit="dimensionless" default="-999">
    460451        <DESCRIPTION>total number of detection measurements in all filters</DESCRIPTION>
    … …  
    463454        <DESCRIPTION>batch id</DESCRIPTION>
    464455      </FIELD>
    465       <FIELD name="gStackID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    466         <DESCRIPTION>stack image id (how to carry through IPP+DVO</DESCRIPTION>
    467       </FIELD>
    468456      <FIELD name="gLensObjSmearX11" arraysize="1" datatype="float" unit="arcsec^-2" default="-999">
    469457        <DESCRIPTION>per-object smear polarizability X11 term</DESCRIPTION>
    … …  
    526514        <DESCRIPTION>psf model shear polarizability E2 term</DESCRIPTION>
    527515      </FIELD>
    528       <FIELD name="rStackID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    529         <DESCRIPTION>stack image id (how to carry through IPP+DVO</DESCRIPTION>
    530       </FIELD>
    531516      <FIELD name="rLensObjSmearX11" arraysize="1" datatype="float" unit="arcsec^-2" default="-999">
    532517        <DESCRIPTION>per-object smear polarizability X11 term</DESCRIPTION>
    … …  
    589574        <DESCRIPTION>psf model shear polarizability E2 term</DESCRIPTION>
    590575      </FIELD>
    591       <FIELD name="iStackID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    592         <DESCRIPTION>stack image id (how to carry through IPP+DVO</DESCRIPTION>
    593       </FIELD>
    594576      <FIELD name="iLensObjSmearX11" arraysize="1" datatype="float" unit="arcsec^-2" default="-999">
    595577        <DESCRIPTION>per-object smear polarizability X11 term</DESCRIPTION>
    … …  
    652634        <DESCRIPTION>psf model shear polarizability E2 term</DESCRIPTION>
    653635      </FIELD>
    654       <FIELD name="zStackID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    655         <DESCRIPTION>stack image id (how to carry through IPP+DVO</DESCRIPTION>
    656       </FIELD>
    657636      <FIELD name="zLensObjSmearX11" arraysize="1" datatype="float" unit="arcsec^-2" default="-999">
    658637        <DESCRIPTION>per-object smear polarizability X11 term</DESCRIPTION>
    … …  
    714693      <FIELD name="zLensPSFShearE2" arraysize="1" datatype="float" unit="dimensionless" default="-999">
    715694        <DESCRIPTION>psf model shear polarizability E2 term</DESCRIPTION>
    716       </FIELD>
    717       <FIELD name="yStackID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
    718         <DESCRIPTION>stack image id (how to carry through IPP+DVO</DESCRIPTION>
    719695      </FIELD>
    720696      <FIELD name="yLensObjSmearX11" arraysize="1" datatype="float" unit="arcsec^-2" default="-999">

  • trunk/ippToPsps/jython/diffobjectbatch.py

    r37927 r38090  
    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("randomID",        "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)") # XXX where does this number come from??
     290        sqlLine.group("randomDiffObjID",        "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)") # 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

    r37927 r38090  
    328328        sqlLine.group("ippObjID",        "OBJ_ID + (CAT_ID << 32)") # NOTE: shift by 32 bits exactly
    329329        sqlLine.group("batchID",         "'" + str(self.batchID) + "'")
     330        sqlLine.group("randomForcedObjID",        "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")
    330331        sqlLine.group("nDetections",      "'0'")
    331332        sql = sqlLine.makeRaw(") SELECT ", " FROM " + cptTableName)
    … …  
    354355        sqlLine.group("objID",           "objID")
    355356        sqlLine.group("uniquePspsFOid","uniquePspsFOid")
     357        sqlLine.group("randomForcedObjID","randomForcedObjID")
    356358        sqlLine.group("ippObjID",        "ippObjID")
    357359        sqlLine.group("batchID",         "batchID")
    358360        sqlLine.group("nDetections",      "nDetections")
    359         sqlLine.group("gStackID",      "gStackID")
    360         sqlLine.group("rStackID",      "rStackID")
    361         sqlLine.group("iStackID",      "iStackID")
    362         sqlLine.group("zStackID",      "zStackID")
    363         sqlLine.group("yStackID",      "yStackID")
    364361
    365362        sql = sqlLine.makeRaw(") SELECT ", " FROM ForcedMeanObject")

  • trunk/ippToPsps/jython/gpc1db.py

    r37935 r38090  
    113113
    114114            stage = "diff"
    115             sql = "SELECT DISTINCT stage_extra1, radeg,decdeg \
     115            sql = "SELECT stage_id, avg(radeg),avg(decdeg) \
    116116                   FROM addRun \
    117117                   JOIN addProcessedExp using (add_id) \
    … …  
    140140                   AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
    141141                   AND dateobs >= '" + tstart + "'\
    142                    AND dateobs <= '" + tend  + "'"
    143 
     142                   AND dateobs <= '" + tend  + "'\
     143                   GROUP BY stage_id"                   
    144144
    145145        elif batchType == "FW":
    146146           
    147147            stage = "fullforce"
    148             sql = "SELECT DISTINCT add_id, radeg, decdeg FROM fullForceInput \
     148            sql = "SELECT stage_id, avg(radeg), avg(decdeg) FROM fullForceInput \
    149149                   JOIN addRun ON(fullForceInput.ff_id = addRun.stage_id AND fullForceInput.warp_id = addRun.stage_extra1) \
    150150                   JOIN minidvodbRun USING(minidvodb_name) \
    … …  
    167167                   AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
    168168                   AND mjd_obs >= (to_days('" + tstart + "')-678941) \
    169                    AND mjd_obs <= (to_days('" + tend + "') - 678941) "
     169                   AND mjd_obs <= (to_days('" + tend + "') - 678941) \
     170                   GROUP BY stage_id"
    170171
    171172        try:

  • trunk/ippToPsps/pspsschema/SchemaNew20.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject

    r38088 r38090  
    55ippObjID        dimensionless   BIGINT  8       NA      IPP object number
    66surveyID        dimensionless   TINYINT 1       255     Survey ID
    7 skyCellID       dimensionless   REAL    4       -999    single float giving PrimaryCell.SkyCell identifier
    87htmID           dimensionless   BIGINT  8       NA      HTM index
    98zoneID          dimensionless   INT     4       NA      Zone index
    10 randomID        dimensionless   BIGINT  8       0       Random integer between 0 and 2^32 = 4,394,967,296 remaining ramdom integer 0 
     9randomDiffObjID         dimensionless   BIGINT  8       0       Random integer between 0 and 2^32 = 4,394,967,296 remaining ramdom integer 0 
    1110batchID         dimensionless   BIGINT  8       -999   
    1211dvoRegionID     dimensionless   INT     4       -999    identifier to dvo spatial region

  • trunk/ippToPsps/pspsschema/SchemaNew20.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject.txt

    r38088 r38090  
    55ippObjID         = dvo:cpt.objID | cpt.catID <<32
    66surveyID         = ipptopsps
    7 skyCellID        = smf header ?? how does this work for objects
    87htmID            = PSPS
    98zoneID           = PSPS
    10 randomID         = ipptopsps
     9randomDiffObjID          = ipptopsps
    1110batchID          = ipptopsps
    1211dvoRegionID      = dvo:cpt:catID

  • trunk/ippToPsps/pspsschema/SchemaNew20.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanLensing

    r38088 r38090  
    33uniquePspsFOid dimensionless BIGINT   8   NA    unique id supplied by ipptopsps
    44ippObjID        dimensionless   BIGINT   8        NA    IPP object identifier
     5randomForcedMeanObjID dimensionless BIGINT   8    NA    random number for this object 
    56nDetections     dimensionless   SMALLINT 2      -999    total number of detection measurements in all filters
    67batchID         dimensionless   BIGINT   8        NA    batch id
    78-----------------------------------------------------   replicate to bottom for each filter
    8 gStackID        dimensionless   INT      4              stack image id (how to carry through IPP + DVO)
    99gLensObjSmearX11 arcsec^-2      REAL     4      -999    per-object smear polarizability X11 term
    1010gLensObjSmearX12 arcsec^-2      REAL     4      -999    per-object smear polarizability X12 term

  • trunk/ippToPsps/pspsschema/SchemaNew20.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanLensing.txt

    r38088 r38090  
    33uniquePspsFOid   = ipptopsps
    44ippObjID         = cpt.objID | cpt.catID << 32
     5randomForcedObjID = ipptopsps
    56nDetections      = sql sum of cps.NCODE (xnTotal)
    67batchID          = ipptopsps
    78---------------- =
    8 gStackID         = ipptopsps / gpc1 db
    99gLensObjSmearX11 = cpy.X11_SM_OBJ
    1010gLensObjSmearX12 = cpy.X12_SM_OBJ

  • trunk/ippToPsps/pspsschema/SchemaNew20.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject

    r38088 r38090  
    33uniquePspsFOid dimensionless BIGINT   8   NA    unique id supplied by ipptopsps
    44ippObjID        dimensionless   BIGINT   8        NA    IPP object identifier
     5randomForcedObjID dimensionless BIGINT   8        NA    random number generated by ipptopsps
    56nDetections     dimensionless   SMALLINT 2      -999    total number of detection measurements in all filters
    67batchID         dimensionless   BIGINT   8        NA    batch id
    78-----------------------------------------------------   replicate to bottom for each filter
    8 gStackID        dimensionless   INT      4              stack image id (how to carry through IPP + DVO)
    99gnTotal         dimensionless   SMALLINT 2      -999    number of detections in g filter
    1010gnIncPSFFlux     dimensionless   SMALLINT 2      -999    number of detections included in robust psf mean in g filter

  • trunk/ippToPsps/pspsschema/SchemaNew20.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject.txt

    r38088 r38090  
    33uniquePspsFOid   = ipptopsps
    44ippObjID         = cpt.objID | cpt.catID << 32
     5randomForcedObjID = ipptopsps
    56nDetections      = sql sum of cps.NCODE (xnTotal)
    67batchID          = ipptopsps
    78---------------- =
    8 gStackID         = ipptopsps / gpc1 db
    99gnTotal          = cps.NWARP
    1010gnIncPSFFlux     = cps.NUSED_WRP
Note: See TracChangeset for help on using the changeset viewer.