IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 33647


Ignore:
Timestamp:
Apr 1, 2012, 2:18:05 PM (14 years ago)
Author:
eugene
Message:

add PS1_V3 schema; support for flat-field correction table in dvo; support for distributed dvo tables; support for ubercal fields and average ap mags; 4bit summary of detection-level photometry flags; 32bit values for poor & bad masks in photcode table

Location:
trunk/Ohana/src/libautocode
Files:
7 edited
7 copied

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/libautocode/Makefile.Targets

    r31160 r33647  
    1010$(ASRC)/average-ps1-v1.$(ARCH).o \
    1111$(ASRC)/average-ps1-v2.$(ARCH).o \
     12$(ASRC)/average-ps1-v3.$(ARCH).o \
    1213$(ASRC)/average-ps1-ref.$(ARCH).o \
    1314$(ASRC)/secfilt.$(ARCH).o \
    … …  
    2021$(ASRC)/secfilt-ps1-v1.$(ARCH).o \
    2122$(ASRC)/secfilt-ps1-v2.$(ARCH).o \
     23$(ASRC)/secfilt-ps1-v3.$(ARCH).o \
    2224$(ASRC)/secfilt-ps1-ref.$(ARCH).o \
    2325$(ASRC)/measure.$(ARCH).o \
    … …  
    3032$(ASRC)/measure-ps1-v1.$(ARCH).o \
    3133$(ASRC)/measure-ps1-v2.$(ARCH).o \
     34$(ASRC)/measure-ps1-v3.$(ARCH).o \
    3235$(ASRC)/measure-ps1-ref.$(ARCH).o \
    3336$(ASRC)/missing.$(ARCH).o \
    … …  
    3942$(ASRC)/photcode-ps1-v1.$(ARCH).o \
    4043$(ASRC)/photcode-ps1-v2.$(ARCH).o \
     44$(ASRC)/photcode-ps1-v3.$(ARCH).o \
    4145$(ASRC)/photcode-ps1-ref.$(ARCH).o \
    4246$(ASRC)/image.$(ARCH).o \
    … …  
    5054$(ASRC)/image-ps1-v1.$(ARCH).o \
    5155$(ASRC)/image-ps1-v2.$(ARCH).o \
     56$(ASRC)/image-ps1-v3.$(ARCH).o \
    5257$(ASRC)/image-ps1-ref.$(ARCH).o \
    5358$(ASRC)/regimage.$(ARCH).o \
    … …  
    6974$(ASRC)/GSCRegion.$(ARCH).o \
    7075$(ASRC)/AddstarClientOptions.$(ARCH).o \
    71 $(ASRC)/SkyRegion.$(ARCH).o
     76$(ASRC)/SkyRegion.$(ARCH).o \
     77$(ASRC)/FlatCorrectionImage.$(ARCH).o \
     78$(ASRC)/FlatCorrection.$(ARCH).o
    7279
    7380AINCS = \
    … …  
    8289$(AINC)/average-ps1-v1.h \
    8390$(AINC)/average-ps1-v2.h \
     91$(AINC)/average-ps1-v3.h \
    8492$(AINC)/average-ps1-ref.h \
    8593$(AINC)/secfilt.h \
    … …  
    92100$(AINC)/secfilt-ps1-v1.h \
    93101$(AINC)/secfilt-ps1-v2.h \
     102$(AINC)/secfilt-ps1-v3.h \
    94103$(AINC)/secfilt-ps1-ref.h \
    95104$(AINC)/measure.h \
    … …  
    102111$(AINC)/measure-ps1-v1.h \
    103112$(AINC)/measure-ps1-v2.h \
     113$(AINC)/measure-ps1-v3.h \
    104114$(AINC)/measure-ps1-ref.h \
    105115$(AINC)/missing.h \
    … …  
    111121$(AINC)/photcode-ps1-v1.h \
    112122$(AINC)/photcode-ps1-v2.h \
     123$(AINC)/photcode-ps1-v3.h \
    113124$(AINC)/photcode-ps1-ref.h \
    114125$(AINC)/image.h \
    … …  
    122133$(AINC)/image-ps1-v1.h \
    123134$(AINC)/image-ps1-v2.h \
     135$(AINC)/image-ps1-v3.h \
    124136$(AINC)/image-ps1-ref.h \
    125137$(AINC)/regimage.h \
    … …  
    141153$(AINC)/GSCRegion.h \
    142154$(AINC)/AddstarClientOptions.h \
    143 $(AINC)/SkyRegion.h
     155$(AINC)/SkyRegion.h \
     156$(AINC)/FlatCorrectionImage.h \
     157$(AINC)/FlatCorrection.h
    144158
    145159# $(ASRC)/Stars.$(ARCH).o

  • trunk/Ohana/src/libautocode/def/SkyRegion.d

    r5945 r33647  
    88FIELD   Dmin,      D_MIN,          float,
    99FIELD   Dmax,      D_MAX,          float,
    10 FIELD   childS,    CHILD_S,        int,           sequence number in full table of first child
    11 FIELD   childE,    CHILD_E,        int,           sequence number in full table of last child + 1
    12 FIELD   parent,    PARENT,         int,           sequence number in full table of parent
    13 FIELD   index,     INDEX,          int,           sequence number in full table of this entry
    14 FIELD   depth,     DEPTH,          char,          depth of this entry
    15 FIELD   child,     CHILD,          char,          does this entry have children?
    16 FIELD   table,     TABLE,          char,          does this entry have a table?
    17 FIELD   name,      NAME,           char[21],      name / filename
     10FIELD   childS,    CHILD_S,        int,            sequence number in full table of first child
     11FIELD   childE,    CHILD_E,        int,            sequence number in full table of last child + 1
     12FIELD   parent,    PARENT,         int,            sequence number in full table of parent
     13FIELD   index,     INDEX,          int,            sequence number in full table of this entry
     14FIELD   depth,     DEPTH,          char,           depth of this entry
     15FIELD   child,     CHILD,          char,           does this entry have children?
     16FIELD   table,     TABLE,          char,           does this entry have a table?
     17FIELD   name,      NAME,           char[18],       name / filename
     18FIELD   hostFlags, HOST_FLAGS,     char,           flags to define host / backup usage
     19FIELD   hostID,    HOST_ID,        unsigned char,  host ID where data is stored
     20FIELD   backupID,  BACKUP_ID,      unsigned char,  host ID where backup is stored
     21
     22# note : 2012.02.05 : stole 3 bytes from 'name' to use for host ID and
     23#        related (no DBs were created with more than 17 bytes in the
     24#        name).  The hostID points at an entry in the host table (text
     25#        file, with name given in SkyTable PHU header).  There is no
     26#        safety on this, but it is recoverable (by examining the
     27#        directories) if misplaced.
     28 
     29#        Note that SkyTables from databases generated in the past may
     30#        have garbage characters here.  To ensure catch this
     31#        condition, we add a header keyword to SkyTables in which the
     32#        hostID has been set; if that is not present, the SkyTable
     33#        loading software should init these bytes to 0 (== unassigned).

  • trunk/Ohana/src/libautocode/def/average-ps1-v2.d

    r27579 r33647  
    99FIELD R,              RA,          double,          RA,                           decimal degrees
    1010FIELD D,              DEC,         double,          DEC,                          decimal degrees
    11 FIELD dR,             RA_ERR,      float,           RA error                      arcsec
    12 FIELD dD,             DEC_ERR,     float,           DEC error                     arcsec
     11FIELD dR,             RA_ERR,      float,           RA error,                     arcsec
     12FIELD dD,             DEC_ERR,     float,           DEC error,                    arcsec
    1313
    1414FIELD uR,             U_RA,        float,           RA*cos(D) proper-motion,      arcsec/year

  • trunk/Ohana/src/libautocode/def/average.d

    r27579 r33647  
    22EXTNAME      DVO_AVERAGE
    33TYPE         BINTABLE
    4 SIZE         112
     4SIZE         120
    55DESCRIPTION  DVO Average Object Table
    66
    … …  
    3939# 'flags' was called 'code' prior to 2009.02.07
    4040FIELD flags,          FLAGS,       uint32_t,        average object flags (star; ghost; etc)
     41FIELD photFlagsUpper, PHOTFLAGS_U, uint32_t,        upper bit of 2 bit summary of per-measure photflags
     42FIELD photFlagsLower, PHOTFLAGS_L, uint32_t,        lower bit of 2 bit summary of per-measure photflags
    4143
    4244# objID + catID gives a unique ID for all objects in the database
    … …  
    5456# *** 20100331 : new fields needed to assess astrometry analysis quality:
    5557
     58
     59# photflagsUpper & photflagsLower: we have Nmeasures of a given source
     60# using psphot. each of these as a photFlag field, with bits
     61# describing the detection quality.  photflagsUpper and photFlagsLower
     62# represent a 2 bit value (0-3) which defines the frequency of a given
     63# bit in the measurements:
     64# for a given bit, if that bit is raised for these percentile ranges,
     65# the following bits are set:
     66# min |  max | L | U
     67#  0% |  25% | 0 | 0
     68# 25% |  50% | 1 | 0
     69# 50% |  75% | 0 | 1
     70# 75% | 100% | 1 | 1

  • trunk/Ohana/src/libautocode/def/image.d

    r30604 r33647  
    1  STRUCT       Image
     1STRUCT       Image
    22EXTNAME      DVO_IMAGE
    33TYPE         BINTABLE
    … …  
    6363FIELD     nLinkAstrom,      NLINK_ASTROM,         short,          mean number of matched measurements for astrometry
    6464FIELD     nLinkPhotom,      NLINK_PHOTOM,         short,          mean number of matched measurements for astrometry
    65 FIELD     dummy3,           DUMMY3,               short,          place holder for byte boundaries
     65FIELD     ubercalDist,      UBERCAL_DIST,         short,          distance to nearest ubercal image
    6666
    6767FIELD     dXpixSys,         XPIX_SYS_ERR,         float,          systematic astrometry error in X

  • trunk/Ohana/src/libautocode/def/photcode.d

    r17189 r33647  
    22EXTNAME      DVO_PHOTCODE_RAW
    33TYPE         BINTABLE
    4 SIZE         104
     4SIZE         112
    55DESCRIPTION  DVO Photcode Description Table
    66
    … …  
    2222FIELD  astromErrScale,    ASTROM_ERR_SCALE,      float,          astrometric error scale
    2323FIELD  astromErrMagScale, ASTROM_ERR_MAG_SCALE,  float,          astrometric error / mag error scale
    24 FIELD  astromPoorMask,    ASTROM_POOR_MASK,      short,          detections matching this mask should only be used in emergencies
    25 FIELD  astromBadMask,     ASTROM_BAD_MASK,       short,          detections matching this mask should not be used
     24FIELD  astromPoorMask,    ASTROM_POOR_MASK,      int,            detections matching this mask should only be used in emergencies
     25FIELD  astromBadMask,     ASTROM_BAD_MASK,       int,            detections matching this mask should not be used
    2626FIELD  photomErrSys,      PHOTOM_ERR_SYS,        float,          systematic photometric error
    27 FIELD  photomPoorMask,    PHOTOM_POOR_MASK,      short,          detections matching this mask should only be used in emergencies
    28 FIELD  photomBadMask,     PHOTOM_BAD_MASK,       short,          detections matching this mask should not be used
     27FIELD  photomPoorMask,    PHOTOM_POOR_MASK,      int,            detections matching this mask should only be used in emergencies
     28FIELD  photomBadMask,     PHOTOM_BAD_MASK,       int,            detections matching this mask should not be used
    2929
    3030#   dR_total^2 =  dR_sys^2 + AS * dR_obs^2 + MS * dM_obs^2

  • trunk/Ohana/src/libautocode/def/secfilt.d

    r27579 r33647  
    22EXTNAME      DVO_SECFILT
    33TYPE         BINTABLE
    4 SIZE         24
     4SIZE         32
    55DESCRIPTION  DVO SecFilt : Secondary Filter Data
    66
    77# elements of data structure / FITS table
    8 FIELD  M,     MAG,      float,                other mags,       mags
    9 FIELD  dM,    MAG_ERR,  float,                scatter on mag,   mags
    10 FIELD  Xm,    MAG_CHI,  float,                chisq on average mag,     [100*log(value)]
    11 FIELD  flags, FLAGS,    uint32_t,             photometry flags
    12 FIELD  Ncode, NCODE,    short,                number of detections in band
    13 FIELD  Nused, NUSED,    short,                number of detections used in average
    14 FIELD  M_20,  MAG_20,   short,                lower 20percent mag,      millimags
    15 FIELD  M_80,  MAG_80,   short,                upper 20percent mag,      millimags
     8FIELD  M,           MAG,          float,      average mag in this band,              mags
     9FIELD  Map,         MAG,          float,      average mag in this band,              mags
     10FIELD  dM,          MAG_ERR,      float,      formal error on average mag,           mags
     11FIELD  Xm,          MAG_CHI,      float,      chisq on average mag,                  [100*log(value)]
     12FIELD  flags,       FLAGS,        uint32_t,   photometry flags
     13FIELD  Ncode,       NCODE,        short,      number of detections in band
     14FIELD  Nused,       NUSED,        short,      number of detections used in average
     15FIELD  M_20,        MAG_20,       short,      lower 20percent mag,                   millimags
     16FIELD  M_80,        MAG_80,       short,      upper 20percent mag,                   millimags
     17FIELD  ubercalDist, UBERCAL_DIST, short,      number of images from an ubercal-image
     18FIELD  dummy,       DUMMY,        char[2],    padding
    1619
    1720# *** 20090206 : new fields : M_20, M_80; dropped dummy
     21# *** 20120302 : new fields : ubercalDist, Map, dummy[2byte]
Note: See TracChangeset for help on using the changeset viewer.