IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37034


Ignore:
Timestamp:
Jul 17, 2014, 10:08:31 AM (12 years ago)
Author:
eugene
Message:

adding PS1_V5 dvo format, changing Xm to Mchisq generally (true float value of chisq)

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

Legend:

Unmodified
Added
Removed
  • trunk/Ohana/src/libautocode/Makefile.Targets

    r34405 r37034  
    1212$(ASRC)/average-ps1-v3.$(ARCH).o \
    1313$(ASRC)/average-ps1-v4.$(ARCH).o \
     14$(ASRC)/average-ps1-v5.$(ARCH).o \
    1415$(ASRC)/average-ps1-ref.$(ARCH).o \
    1516$(ASRC)/secfilt.$(ARCH).o \
     
    2425$(ASRC)/secfilt-ps1-v3.$(ARCH).o \
    2526$(ASRC)/secfilt-ps1-v4.$(ARCH).o \
     27$(ASRC)/secfilt-ps1-v5.$(ARCH).o \
    2628$(ASRC)/secfilt-ps1-ref.$(ARCH).o \
    2729$(ASRC)/measure.$(ARCH).o \
     
    3638$(ASRC)/measure-ps1-v3.$(ARCH).o \
    3739$(ASRC)/measure-ps1-v4.$(ARCH).o \
     40$(ASRC)/measure-ps1-v5.$(ARCH).o \
    3841$(ASRC)/measure-ps1-ref.$(ARCH).o \
     42$(ASRC)/lensing.$(ARCH).o \
     43$(ASRC)/lensing-ps1-v5.$(ARCH).o \
     44$(ASRC)/lensobj.$(ARCH).o \
     45$(ASRC)/lensobj-ps1-v5.$(ARCH).o \
    3946$(ASRC)/missing.$(ARCH).o \
    4047$(ASRC)/photcode.$(ARCH).o \
     
    4754$(ASRC)/photcode-ps1-v3.$(ARCH).o \
    4855$(ASRC)/photcode-ps1-v4.$(ARCH).o \
     56$(ASRC)/photcode-ps1-v5.$(ARCH).o \
    4957$(ASRC)/photcode-ps1-ref.$(ARCH).o \
    5058$(ASRC)/image.$(ARCH).o \
     
    6068$(ASRC)/image-ps1-v3.$(ARCH).o \
    6169$(ASRC)/image-ps1-v4.$(ARCH).o \
     70$(ASRC)/image-ps1-v5.$(ARCH).o \
    6271$(ASRC)/image-ps1-ref.$(ARCH).o \
    6372$(ASRC)/regimage.$(ARCH).o \
     
    7382$(ASRC)/cmf-ps1-sv1.$(ARCH).o \
    7483$(ASRC)/cmf-ps1-sv2.$(ARCH).o \
     84$(ASRC)/cmf-ps1-dv4.$(ARCH).o \
    7585$(ASRC)/cmf-smpdata.$(ARCH).o \
    7686$(ASRC)/getstar-ps1-dev-0.$(ARCH).o \
     
    8494$(ASRC)/FlatCorrectionImage.$(ARCH).o \
    8595$(ASRC)/FlatCorrection.$(ARCH).o
     96
     97# $(ASRC)/cmf-ps1-sv3.$(ARCH).o
    8698
    8799AINCS = \
     
    98110$(AINC)/average-ps1-v3.h \
    99111$(AINC)/average-ps1-v4.h \
     112$(AINC)/average-ps1-v5.h \
    100113$(AINC)/average-ps1-ref.h \
    101114$(AINC)/secfilt.h \
     
    110123$(AINC)/secfilt-ps1-v3.h \
    111124$(AINC)/secfilt-ps1-v4.h \
     125$(AINC)/secfilt-ps1-v5.h \
    112126$(AINC)/secfilt-ps1-ref.h \
    113127$(AINC)/measure.h \
     
    122136$(AINC)/measure-ps1-v3.h \
    123137$(AINC)/measure-ps1-v4.h \
     138$(AINC)/measure-ps1-v5.h \
    124139$(AINC)/measure-ps1-ref.h \
     140$(AINC)/lensing.h \
     141$(AINC)/lensing-ps1-v5.h \
     142$(AINC)/lensobj.h \
     143$(AINC)/lensobj-ps1-v5.h \
    125144$(AINC)/missing.h \
    126145$(AINC)/photcode.h \
     
    133152$(AINC)/photcode-ps1-v3.h \
    134153$(AINC)/photcode-ps1-v4.h \
     154$(AINC)/photcode-ps1-v5.h \
    135155$(AINC)/photcode-ps1-ref.h \
    136156$(AINC)/image.h \
     
    146166$(AINC)/image-ps1-v3.h \
    147167$(AINC)/image-ps1-v4.h \
     168$(AINC)/image-ps1-v5.h \
    148169$(AINC)/image-ps1-ref.h \
    149170$(AINC)/regimage.h \
     
    159180$(AINC)/cmf-ps1-sv1.h \
    160181$(AINC)/cmf-ps1-sv2.h \
     182$(AINC)/cmf-ps1-dv4.h \
    161183$(AINC)/cmf-smpdata.h \
    162184$(AINC)/getstar-ps1-dev-0.h \
  • trunk/Ohana/src/libautocode/def/average.d

    r36833 r37034  
    22EXTNAME      DVO_AVERAGE
    33TYPE         BINTABLE
    4 SIZE         128
     4SIZE         184
    55DESCRIPTION  DVO Average Object Table
    66
     
    1919FIELD dP,             PAR_ERR,     float,           parallax error,               arcsec
    2020
     21FIELD Rstk,           RA_STK,      double,          RA on stack,                  decimal degrees
     22FIELD Dstk,           DEC_STK,     double,          DEC on stack,                 decimal degrees
     23FIELD dRstk,          RA_STK_ERR,  float,           RA error on stack,            arcsec
     24FIELD dDstk,          DEC_STK_ERR, float,           DEC error on stack,           arcsec
     25
    2126FIELD ChiSqAve,       CHISQ_POS,   float,           astrometry analysis chisq
    2227FIELD ChiSqPM,        CHISQ_PM,    float,           astrometry analysis chisq
     
    3439FIELD Nmeasure,       NMEASURE,    unsigned short,  number of psf measurements
    3540FIELD Nmissing,       NMISSING,    unsigned short,  number of missings
     41FIELD Nlensing,       NLENSING,    unsigned short,  number of lensing measurements
     42FIELD Nlensobj,       NLENSOBJ,    unsigned short,  number of lensing measurements
    3643FIELD Nextend,        NEXTEND,     unsigned short,  number of extended measurements
    3744
    3845FIELD measureOffset,  OFF_MEASURE, int,             offset to first psf measurement
    3946FIELD missingOffset,  OFF_MISSING, int,             offset to first missing obs
    40 FIELD refColor,       REF_COLOR,   float,           color of astrometry ref stars
     47FIELD lensingOffset,  OFF_LENSING, int,             offset to first lensing obs
     48FIELD lensobjOffset,  OFF_LENSOBJ, int,             offset to mean lensing data
     49FIELD extendOffset,   OFF_EXTEND,  int,             offset to extended object entry
     50FIELD paramsOffset,   OFF_PARAMS,  int,             offset to stellar parameter data
     51
     52FIELD refColorBlue,   REF_COLOR_BLUE, float,        color of astrometry ref stars
     53FIELD refColorRed,    REF_COLOR_RED,  float,        color of astrometry ref stars
    4154
    4255# 'flags' was called 'code' prior to 2009.02.07
     
    4962FIELD catID,          CAT_ID,      unsigned int,    unique ID for table in which object was first realized
    5063FIELD extID,          EXT_ID,      uint64_t,        external ID for object (eg PSPS objID)
     64FIELD extIDgc,        EXT_ID_GC,   uint64_t,        external ID for object in galactic coords
    5165
    5266# this structure should only be used for internal representations
     
    5670
    5771# *** 20090206 : new fields : ChiSq, Npos, flags (was code, uint16_t), extID
    58 
    5972# *** 20100331 : new fields needed to assess astrometry analysis quality:
    60 
     73# *** 20140617 : new fields : Rstk, Dstk, dRstk,dDstk, Nlensing, Nlensobj, lensingOffset, lensobjOffset, refColor
    6174
    6275# photflagsUpper & photflagsLower: we have Nmeasures of a given source
  • trunk/Ohana/src/libautocode/def/common.h

    r34088 r37034  
    3232# define rawshort short
    3333
    34 # define DVO_IMAGE_NAME_LEN 121
     34# define DVO_IMAGE_NAME_LEN 117
    3535
    3636/*** rawshort is used to handle the broken pre-autocode photreg tables
  • trunk/Ohana/src/libautocode/def/image.d

    r36833 r37034  
    4444FIELD     DECo,             DEC_CENTER,           float,          image center,              degrees
    4545FIELD     Radius,           RADIUS,               float,          image radius,              degrees
    46 FIELD     refColor,         REF_COLOR,            float,          dummy
     46FIELD     refColorBlue,     REF_COLOR_BLUE,       float,          median astrometry ref color
     47FIELD     refColorRed,      REF_COLOR_RED,        float,          median astrometry ref color
    4748
    48 FIELD     name,             NAME,                 char[121],      name of original image
     49# should we define the max length of name as a macro?
     50FIELD     name,             NAME,                 char[117],      name of original image
    4951FIELD     detection_limit,  DETECTION_LIMIT,      unsigned char,  detection limit,           10*mag
    5052FIELD     saturation_limit, SATURATION_LIMIT,     unsigned char,  saturation limit,          10*mag
  • trunk/Ohana/src/libautocode/def/measure.d

    r35099 r37034  
    22EXTNAME      DVO_MEASURE
    33TYPE         BINTABLE
    4 SIZE         184
     4SIZE         228
    55DESCRIPTION  DVO Detection Measurement Table
    66
    7 FIELD dR,             D_RA,         float,          RA offset,                      arcsec
    8 FIELD dD,             D_DEC,        float,          DEC offset,                     arcsec
    9 FIELD M,              MAG,          float,          catalog mag,                    mag
    10 FIELD Mcal,           M_CAL,        float,          image cal mag,                  mag
    11 FIELD Map,            M_APER,       float,          aperture mag,                   mag
    12 FIELD Mkron,          M_KRON,       float,          kron magnitude,                 mag
    13 FIELD dMkron,         M_KRON_ERR,   float,          kron magnitude error,           mag
    14 FIELD dM,             MAG_ERR,      float,          mag error,                      mag
    15 FIELD dMcal,          MAG_CAL_ERR,  float,          systematic calibration error,   mag
    16 FIELD dt,             M_TIME,       float,          exposure time,                  2.5*log(exptime)
     7FIELD R,              RA,            double,         RA at epoch,                  degrees
     8FIELD D,              DEC,           double,         DEC at epoch,                 degrees
     9FIELD M,              MAG,           float,          catalog mag,                    mag
     10FIELD dM,             MAG_ERR,       float,          mag error,                      mag
     11FIELD Map,            M_APER,        float,          aperture mag,                   mag
     12FIELD dMap,           M_APER,        float,          aperture mag,                   mag
     13FIELD Mkron,          M_KRON,        float,          kron magnitude,                 mag
     14FIELD dMkron,         M_KRON_ERR,    float,          kron magnitude error,           mag
     15FIELD Mcal,           M_CAL,         float,          image cal mag,                  mag
     16FIELD dMcal,          MAG_CAL_ERR,   float,          systematic calibration error,   mag
     17FIELD dt,             M_TIME,        float,          exposure time,                  2.5*log(exptime)
    1718
    1819# for stacks only?
    19 FIELD FluxPSF,        FLUX_PSF,     float,          flux from psf fit,              counts/sec?
    20 FIELD dFluxPSF,       FLUX_PSF_ERR, float,          error on psf flux,              counts/sec?
    21 FIELD FluxKron,       FLUX_KRON,     float,         flux from kron ap,              counts/sec?
    22 FIELD dFluxKron,      FLUX_KRON_ERR, float,         error on kron flux,             counts/sec?
     20FIELD FluxPSF,        FLUX_PSF,      float,         flux from psf fit,              counts/sec
     21FIELD dFluxPSF,       FLUX_PSF_ERR,  float,         error on psf flux,              counts/sec
     22FIELD FluxKron,       FLUX_KRON,     float,         flux from kron ap,              counts/sec
     23FIELD dFluxKron,      FLUX_KRON_ERR, float,         error on kron flux,             counts/sec
     24FIELD FluxAp,         FLUX_AP,       float,         flux from ap,                   counts/sec
     25FIELD dFluxAp,        FLUX_AP_ERR,   float,         error on ap flux,               counts/sec
    2326
    2427# note that with airmass = 1.0 / cos(90 - alt), we have full alt/az representation
     
    3336FIELD Yfix,           Y_FIX,        float,          Y coord after correction,     pixels
    3437
     38FIELD XoffKH,         X_OFF_KH,      float,          X offset from correction,     pixels
     39FIELD YoffKH,         Y_OFF_KH,      float,          Y offset from correction,     pixels
     40FIELD XoffDCR,        X_OFF_DCR,     float,          X offset from correction,     pixels
     41FIELD YoffDCR,        Y_OFF_DCR,     float,          Y offset from correction,     pixels
     42FIELD RoffGAL,        R_OFF_GAL,     float,          RA offset from correction,    arcsec
     43FIELD DoffGAL,        D_OFF_GAL,     float,          DEC offset from correction,   arcsec
     44
    3545# could these be packed into fewer bits?
    3646FIELD Sky,            SKY_FLUX,     float,          local estimate of sky flux,     counts/sec
     
    3848
    3949FIELD t,              TIME,         int,            time in seconds (UNIX)
    40 FIELD t_msec,         TIME_MSEC,    unsigned short, time fraction of second,        milliseconds
    4150FIELD averef,         AVE_REF,      unsigned int,   reference to average entry     
    4251
    4352FIELD detID,          DET_ID,       unsigned int,   detection ID
    44 FIELD imageID,        IMAGE_ID,     unsigned int,   reference to DVO image ID
    4553FIELD objID,          OBJ_ID,       unsigned int,   unique ID for object in table
    4654FIELD catID,          CAT_ID,       unsigned int,   unique ID for table in which object was first realized
     
    4856# PSPS uses a 64-bit detection ID
    4957FIELD extID,          EXT_ID,       uint64_t,       external ID (eg PSPS detID)
     58
     59FIELD imageID,        IMAGE_ID,     unsigned int,   reference to DVO image ID
    5060
    5161# do we need more resolution than a short? should this be a log?
     
    6979FIELD Myy,            MYY,          short,          second moments in pixel coords, 1/100 of pixels^2
    7080
     81# fractional exposure time
     82FIELD t_msec,         TIME_MSEC,    unsigned short, time fraction of second,        milliseconds
     83FIELD photcode,       PHOTCODE,     unsigned short, photcode
     84
    7185# convert this to error in pixels on load?
    7286FIELD dXccd,          X_CCD_ERR,    short,          X coord error on chip,          1/100 of pixels
     
    7791FIELD pltscale,       PLTSCALE,     float,          plate scale,                    arcsec/pixel
    7892
    79 FIELD photcode,       PHOTCODE,     unsigned short, photcode
    8093FIELD dbFlags,        DB_FLAGS,     unsigned int,   flags supplied by analysis in database
    8194FIELD photFlags,      PHOT_FLAGS,   unsigned int,   flags supplied by photometry program
     
    8598#                Changed dbFlags, photFlags : uint16_t to uint64_t
    8699
     100# *** 20140617 : changed: dR,dD -> R,D (removed dependence on average.R,D)
     101                 added: dMap, FluxAp, dFluxAp, (X,Y)off(KH,DCR,GAL)
     102
    87103# XXX unsigned int values are probably not being saved in the FITS file correctly: no BZERO, BSCALE
  • trunk/Ohana/src/libautocode/def/photcode-ps1-v2.d

    r27579 r37034  
    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,      unsigned short,   detections matching this mask should only be used in emergencies
     25FIELD  astromBadMask,     ASTROM_BAD_MASK,       unsigned short,   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,      unsigned short,   detections matching this mask should only be used in emergencies
     28FIELD  photomBadMask,     PHOTOM_BAD_MASK,       unsigned short,   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/photcode-ps1-v3.d

    r33647 r37034  
    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,      int,            detections matching this mask should only be used in emergencies
    25 FIELD  astromBadMask,     ASTROM_BAD_MASK,       int,            detections matching this mask should not be used
     24FIELD  astromPoorMask,    ASTROM_POOR_MASK,      unsigned int,   detections matching this mask should only be used in emergencies
     25FIELD  astromBadMask,     ASTROM_BAD_MASK,       unsigned int,   detections matching this mask should not be used
    2626FIELD  photomErrSys,      PHOTOM_ERR_SYS,        float,          systematic photometric error
    27 FIELD  photomPoorMask,    PHOTOM_POOR_MASK,      int,            detections matching this mask should only be used in emergencies
    28 FIELD  photomBadMask,     PHOTOM_BAD_MASK,       int,            detections matching this mask should not be used
     27FIELD  photomPoorMask,    PHOTOM_POOR_MASK,      unsigned int,   detections matching this mask should only be used in emergencies
     28FIELD  photomBadMask,     PHOTOM_BAD_MASK,       unsigned 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/photcode-ps1-v4.d

    r34260 r37034  
    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,      int,            detections matching this mask should only be used in emergencies
    25 FIELD  astromBadMask,     ASTROM_BAD_MASK,       int,            detections matching this mask should not be used
     24FIELD  astromPoorMask,    ASTROM_POOR_MASK,      unsigned int,   detections matching this mask should only be used in emergencies
     25FIELD  astromBadMask,     ASTROM_BAD_MASK,       unsigned int,   detections matching this mask should not be used
    2626FIELD  photomErrSys,      PHOTOM_ERR_SYS,        float,          systematic photometric error
    27 FIELD  photomPoorMask,    PHOTOM_POOR_MASK,      int,            detections matching this mask should only be used in emergencies
    28 FIELD  photomBadMask,     PHOTOM_BAD_MASK,       int,            detections matching this mask should not be used
     27FIELD  photomPoorMask,    PHOTOM_POOR_MASK,      unsigned int,   detections matching this mask should only be used in emergencies
     28FIELD  photomBadMask,     PHOTOM_BAD_MASK,       unsigned 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/photcode.d

    r33647 r37034  
    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,      int,            detections matching this mask should only be used in emergencies
    25 FIELD  astromBadMask,     ASTROM_BAD_MASK,       int,            detections matching this mask should not be used
     24FIELD  astromPoorMask,    ASTROM_POOR_MASK,      unsigned int,   detections matching this mask should only be used in emergencies
     25FIELD  astromBadMask,     ASTROM_BAD_MASK,       unsigned int,   detections matching this mask should not be used
    2626FIELD  photomErrSys,      PHOTOM_ERR_SYS,        float,          systematic photometric error
    27 FIELD  photomPoorMask,    PHOTOM_POOR_MASK,      int,            detections matching this mask should only be used in emergencies
    28 FIELD  photomBadMask,     PHOTOM_BAD_MASK,       int,            detections matching this mask should not be used
     27FIELD  photomPoorMask,    PHOTOM_POOR_MASK,      unsigned int,   detections matching this mask should only be used in emergencies
     28FIELD  photomBadMask,     PHOTOM_BAD_MASK,       unsigned 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-ps1-v1.d

    r21508 r37034  
    66
    77# elements of data structure / FITS table
    8 FIELD  M,     MAG,      float,                average mag in this band, mags
    9 FIELD  dM,    MAG_ERR,  float,                error on average mag,     mags
    10 FIELD  Xm,    MAG_CHI,  float,                chisq on average mag,     [100*log(value)]
    11 FIELD  Ncode, NCODE,    short,                number of detections in band
    12 FIELD  Nused, NUSED,    short,                number of detections used in average
    13 FIELD  M_20,  MAG_20,   short,                lower 20percent mag,      millimags
    14 FIELD  M_80,  MAG_80,   short,                upper 20percent mag,      millimags
     8FIELD  M,      MAG,      float,                average mag in this band, mags
     9FIELD  dM,     MAG_ERR,  float,                error on average mag,     mags
     10FIELD  Mchisq, MAG_CHI,  float,                chisq on average mag,                  value
     11FIELD  Ncode,  NCODE,    short,                number of detections in band
     12FIELD  Nused,  NUSED,    short,                number of detections used in average
     13FIELD  M_20,   MAG_20,   short,                lower 20percent mag,      millimags
     14FIELD  M_80,   MAG_80,   short,                upper 20percent mag,      millimags
  • trunk/Ohana/src/libautocode/def/secfilt-ps1-v2.d

    r27579 r37034  
    66
    77# elements of data structure / FITS table
    8 FIELD  M,     MAG,      float,                average mag in this band, mags
    9 FIELD  dM,    MAG_ERR,  float,                error on average 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  dM,     MAG_ERR,  float,                error on average mag,     mags
     10FIELD  Mchisq, MAG_CHI,  float,                chisq on average mag,     value
     11FIELD  flags,  FLAGS,    uint32_t,             photometry flags
     12FIELD  Ncode,  NCODE,    short,                number of detections in band
     13FIELD  Nused,  NUSED,    short,                number of detections used in average
     14FIELD  M_20,   MAG_20,   short,                lower 20percent mag,      millimags
     15FIELD  M_80,   MAG_80,   short,                upper 20percent mag,      millimags
  • trunk/Ohana/src/libautocode/def/secfilt-ps1-v3.d

    r33963 r37034  
    99FIELD  Map,         MAG_AP,       float,      ave aperture mag in this band,         mags
    1010FIELD  dM,          MAG_ERR,      float,      formal error on average mag,           mags
    11 FIELD  Xm,          MAG_CHI,      float,      chisq on average mag,                  [100*log(value)]
     11FIELD  Mchisq,      MAG_CHI,      float,      chisq on average mag,                  value
    1212FIELD  flags,       FLAGS,        uint32_t,   photometry flags
    1313FIELD  Ncode,       NCODE,        short,      number of detections in band
  • trunk/Ohana/src/libautocode/def/secfilt-ps1-v4.d

    r34620 r37034  
    1111FIELD  dMkron,        MAG_KRON_ERR,    float,      formal error on average kron mag,      mags
    1212FIELD  dM,            MAG_ERR,         float,      formal error on average mag,           mags
    13 FIELD  Xm,            MAG_CHI,         float,      chisq on average mag,                  [100*log(value)]
     13FIELD  Mchisq,        MAG_CHI,         float,      chisq on average mag,                  value
    1414FIELD  FluxPSF,       FLUX_PSF,        float,      mean flux psf fit (PS1: stack)
    1515FIELD  dFluxPSF,      FLUX_PSF_ERR,    float,      mean flux psf error
  • trunk/Ohana/src/libautocode/def/secfilt.d

    r35099 r37034  
    22EXTNAME      DVO_SECFILT
    33TYPE         BINTABLE
    4 SIZE         64
     4SIZE         160
    55DESCRIPTION  DVO SecFilt : Secondary Filter Data
    66
    7 # elements of data structure / FITS table
     7## *** this section is for per-exposure mean values *** (unlabled values are implicitly PSF values)
    88FIELD  M,             MAG,             float,      average mag in this band,              mags
     9FIELD  dM,            MAG_ERR,         float,      formal error on average mag,           mags
    910FIELD  Map,           MAG_AP,          float,      average mag in this band,              mags
     11FIELD  dMap,          MAG_AP_ERR,      float,      formal error on average mag,           mags
     12FIELD  sMap,          MAG_AP_STDEV,    float,      standard deviation of ap mags,         mags
    1013FIELD  Mkron,         MAG_KRON,        float,      ave kron mag in this band,             mags
    1114FIELD  dMkron,        MAG_KRON_ERR,    float,      formal error on average kron mag,      mags
    12 FIELD  dM,            MAG_ERR,         float,      formal error on average mag,           mags
    13 FIELD  Xm,            MAG_CHI,         float,      chisq on average mag,                  [100*log(value)]
    14 FIELD  FluxPSF,       FLUX_PSF,        float,      mean flux psf fit (PS1: stack)
    15 FIELD  dFluxPSF,      FLUX_PSF_ERR,    float,      mean flux psf error
    16 FIELD  FluxKron,      FLUX_KRON,       float,      mean flux kron ap (PS1: stack)
    17 FIELD  dFluxKron,     FLUX_KRON_ERR,   float,      mean flux kron err
    18 FIELD  flags,         FLAGS,           uint32_t,   photometry flags
     15FIELD  sMkron,        MAG_KRON_STDEV,  float,      standard deviation of kron mags,       mags
     16
     17# these statistics are PSF-specific     
     18FIELD  Mstdev,        MAG_STDEV,       float,      standard deviation of measurements,    mags
     19FIELD  Mmin,          MAG_MIN,         float,      minimum accepted mag,                  mags
     20FIELD  Mmax,          MAG_MAX,         float,      maximum accepted mag,                  mags
     21FIELD  Mchisq,        MAG_CHI,         float,      chisq on average mag,                  value
     22
    1923FIELD  Ncode,         NCODE,           short,      number of detections in band
    2024FIELD  Nused,         NUSED,           short,      number of detections used in average
    21 FIELD  M_20,          MAG_20,          short,      lower 20percent mag,                   millimags
    22 FIELD  M_80,          MAG_80,          short,      upper 20percent mag,                   millimags
     25FIELD  NusedKron,     NUSED_KRON,      short,      number of detections used in average
     26FIELD  NusedAp,       NUSED_AP,        short,      number of detections used in average
     27
     28FIELD  flags,         FLAGS,           uint32_t,   photometry flags
     29
     30## *** this section is for stack values ***
     31
     32FIELD  MpsfStk,       MAG_PSF_STK,       float,    magnitude from stack (primary if available)
     33FIELD  FpsfStk,       FLUX_PSF_STK,      float,    flux from stack (primary if available)
     34FIELD  dFpsfStk,      FLUX_PSF_STK_ERR,  float,    mean flux psf error
     35
     36FIELD  MkronStk,      MAG_KRON_STK,      float,    magnitude from stack (primary if available)
     37FIELD  FkronStk,      FLUX_KRON_STK,     float,    flux from stack (primary if available)
     38FIELD  dFkronStk,     FLUX_KRON_STK_ERR, float,    mean flux kron error
     39
     40FIELD  MapStk,        MAG_AP_STK,        float,    magnitude from stack (primary if available)
     41FIELD  FapStk,        FLUX_AP_STK,       float,    flux from stack (primary if available)
     42FIELD  dFapStk,       FLUX_AP_STK_ERR,   float,    mean flux ap error
     43
     44## need an 8-byte boundary here ##
     45FIELD  stackDetectID, STACK_DETECT_ID, uint64_t,   detection ID on stack used for fluxes (if any)
     46
     47## *** this section is for forced-warp mean values ***
     48
     49FIELD  MpsfWrp,       MAG_PSF_WRP,       float,    psf magnitude from stack (primary if available)
     50FIELD  FpsfWrp,       FLUX_PSF_WRP,      float,    psf flux from stack (primary if available)
     51FIELD  dFpsfWrp,      FLUX_PSF_WRP_ERR,  float,    mean flux psf error
     52FIELD  sFpsfWrp,      FLUX_PSF_WRP_STD,  float,    mean flux psf stdev
     53
     54FIELD  MkronWrp,      MAG_KRON_WRP,      float,    kron magnitude from stack (primary if available)
     55FIELD  FkronWrp,      FLUX_KRON_WRP,     float,    kron flux from stack (primary if available)
     56FIELD  dFkronWrp,     FLUX_KRON_WRP_ERR, float,    mean flux kron error
     57FIELD  sFkronWrp,     FLUX_KRON_WRP_STD, float,    mean flux kron stdev
     58
     59FIELD  MapWrp,        MAG_AP_WRP,        float,    aper magnitude from stack (primary if available)
     60FIELD  FapWrp,        FLUX_AP_WRP,       float,    aper flux from stack (primary if available)
     61FIELD  dFapWrp,       FLUX_AP_WRP_ERR,   float,    mean flux ap error
     62FIELD  sFapWrp,       FLUX_AP_WRP_STD,   float,    mean flux ap stdev
     63
     64FIELD  NusedWrp,      NUSED_WRP,         short,    number of detections used in average
     65FIELD  NusedKronWrp,  NUSED_KRON_WRP,    short,    number of detections used in average
     66FIELD  NusedApWrp,    NUSED_AP_WRP,      short,    number of detections used in average
     67
    2368FIELD  ubercalDist,   UBERCAL_DIST,    short,      number of images from an ubercal-image
    24 FIELD  Mstdev,        MAG_STDEV,       short,      standard deviation of measurements,    millimags
    25 FIELD  stackDetectID, STACK_DETECT_ID, uint64_t,   detection ID on stack used for fluxes (if any)
    2669
    2770# *** 20090206 : new fields : M_20, M_80; dropped dummy
    2871# *** 20120302 : new fields : ubercalDist, Map, Mstdev
    2972# *** 20120710 : new fields : Mkron, dMkron, FluxPSF, dFluxPSF, FluxKron, dFluxKron, stackID
     73
     74# *** 20140617 : added   : dMap, NusedKron, NusedAp, MpsfStk, MkronStk, MapStk, *Wrp
     75               : changed : Mstdev, M_20 (to Mmin,short:float),M_80 (to Mmax,short:float),
     76               : rename : FpsfStk, dFpsfStk, FkronStk, dFronStk (were FluxPSF, dFluxPSF, FluxKron, dFluxKron)
Note: See TracChangeset for help on using the changeset viewer.