Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/Ohana/src/libautocode/def/average.d

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libautocode/def/average.d (modified) (5 diffs)

branches/eam_branches/ps2-tc3-20130727/Ohana/src/libautocode/def/average.d

@@ -2 +2 @@
 EXTNAME      DVO_AVERAGE
 TYPE         BINTABLE
-SIZE         128
+SIZE         192
 DESCRIPTION  DVO Average Object Table
 
@@ -19 +19 @@
 FIELD dP,             PAR_ERR,     float,           parallax error,               arcsec
 
+FIELD Rstk,           RA_STK,      double,          RA on stack,                  decimal degrees 
+FIELD Dstk,           DEC_STK,     double,          DEC on stack,                 decimal degrees 
+FIELD dRstk,          RA_STK_ERR,  float,           RA error on stack,            arcsec
+FIELD dDstk,          DEC_STK_ERR, float,           DEC error on stack,           arcsec
+
 FIELD ChiSqAve,       CHISQ_POS,   float,           astrometry analysis chisq
 FIELD ChiSqPM,        CHISQ_PM,    float,           astrometry analysis chisq
@@ -34 +39 @@
 FIELD Nmeasure,       NMEASURE,    unsigned short,  number of psf measurements
 FIELD Nmissing,       NMISSING,    unsigned short,  number of missings
+FIELD Nlensing,       NLENSING,    unsigned short,  number of lensing measurements
+FIELD Nlensobj,       NLENSOBJ,    unsigned short,  number of lensing measurements
 FIELD Nextend,        NEXTEND,     unsigned short,  number of extended measurements
 
 FIELD measureOffset,  OFF_MEASURE, int,             offset to first psf measurement
 FIELD missingOffset,  OFF_MISSING, int,             offset to first missing obs
-FIELD extendOffset,   OFF_EXTEND,  int,             offset to first extended measurement
+FIELD lensingOffset,  OFF_LENSING, int,             offset to first lensing obs
+FIELD lensobjOffset,  OFF_LENSOBJ, int,             offset to mean lensing data
+FIELD extendOffset,   OFF_EXTEND,  int,             offset to extended object entry
+FIELD paramsOffset,   OFF_PARAMS,  int,             offset to stellar parameter data
+
+FIELD refColorBlue,   REF_COLOR_BLUE, float,        color of astrometry ref stars
+FIELD refColorRed,    REF_COLOR_RED,  float,        color of astrometry ref stars
+
+FIELD tessID,         TESS_ID,       char,          ID of tessellation for primary skycell
+FIELD skycellID,      SKYCELL_ID,    char,          ID of skycell for primary skycell
+FIELD projectionID,   PROJECTION_ID, short,         ID of projection for primary skycell
+
+FIELD dummy,          DUMMY,         int,           unassigned bytes
 
 # 'flags' was called 'code' prior to 2009.02.07
@@ -49 +68 @@
 FIELD catID,          CAT_ID,      unsigned int,    unique ID for table in which object was first realized
 FIELD extID,          EXT_ID,      uint64_t,        external ID for object (eg PSPS objID)
+FIELD extIDgc,        EXT_ID_GC,   uint64_t,        external ID for object in galactic coords
 
 # this structure should only be used for internal representations
@@ -56 +76 @@
 
 # *** 20090206 : new fields : ChiSq, Npos, flags (was code, uint16_t), extID
-
 # *** 20100331 : new fields needed to assess astrometry analysis quality:
-
+# *** 20140617 : new fields : Rstk, Dstk, dRstk,dDstk, Nlensing, Nlensobj, lensingOffset, lensobjOffset, refColor
 
 # photflagsUpper & photflagsLower: we have Nmeasures of a given source