Changeset 21491

Timestamp:

Feb 15, 2009, 9:57:10 AM (17 years ago)

Author:

eugene

Message:

adding new I/O format and updates to Measure

Location:

branches/eam_branch_20090208/Ohana/src

Files:

• addstar/src/ReadStarsFITS.c (modified) (1 diff)
• libautocode/def/cmf-ps1-v1.d (modified) (4 diffs)
• libautocode/def/measure-ps1-v1.d (modified) (4 diffs)

branches/eam_branch_20090208/Ohana/src/addstar/src/ReadStarsFITS.c

@@ -40 +40 @@
     stars = Convert_PS1_DEV_1 (&table, &Nstars);
   }
-  if (!strcmp (type, "CMF_PS1_V1")) {
+  if (!strcmp (type, "PS1_V1")) {
     stars = Convert_PS1_V1 (&table, &Nstars);
   }

branches/eam_branch_20090208/Ohana/src/libautocode/def/cmf-ps1-v1.d

@@ -3 +3 @@
 EXTNAME CMF_PS1_V1
 TYPE    BINTABLE
-SIZE    120
+SIZE    128
 
 # elements of data structure / FITS table
@@ -18 +18 @@
 FIELD dM,        PSF_INST_MAG_SIG, float,    inst mag error,        mags
 FIELD Map,       AP_MAG_STANDARD,  float,    standard aperture mag, mags
+FIELD apRadius,  AP_MAG_RADIUS,    float,    radius used for fit,   pixels
 FIELD Mpeak,     PEAK_FLUX_AS_MAG, float,    peak flux as a mag,    mags
 FIELD Mcalib,    CAL_PSF_MAG,      float,    calibrated psf mag,    mags
@@ -35 +36 @@
 FIELD Mxy,       MOMENTS_XY,       float,    second moment Y,       pixels^2
 FIELD Myy,       MOMENTS_YY,       float,    second moment XY,      pixels^2
+FIELD flags,     FLAGS,            int,      analysis flags
 FIELD nFrames,   N_FRAMES,         short,    images overlapping peak
-FIELD flags,     FLAGS,            short,    padding
+FIELD padding,   PADDING,          short,    padding for 8byte records
 
 # for an object in an image, we have three triplets that tell us about the shape:
@@ -42 +44 @@
 # model shape parameters: F_major, F_minor, F_theta
 # centroid errors: sigma_X, sigma_Y, sigma_XY
+
+# IPP_IDET         1J  IPP_IDET,           unsigned i
+# X_PSF          1E  X_PSF,        float,        
+# Y_PSF          1E  Y_PSF,        float,        
+# X_PSF_SIG      1E  X_PSF_SIG,            float,        
+# Y_PSF_SIG      1E  Y_PSF_SIG,            float,        
+# RA_PSF         1E  RA_PSF,               float,        
+# DEC_PSF        1E  DEC_PSF,              float,        
+# POSANGLE       1E  POSANGLE,             float,        
+# PLTSCALE       1E  PLTSCALE,             float,        
+# PSF_INST_MAG   1E  PSF_INST_MAG,     float,          
+# PSF_INST_MAG_SIG 1E  PSF_INST_MAG_SIG, float,        
+# AP_MAG_STANDARD  1E  AP_MAG_STANDARD,  float,        
+# AP_MAG_RADIUS    1E      
+# PEAK_FLUX_AS_MAG 1E  PEAK_FLUX_AS_MAG, float,        
+# CAL_PSF_MAG      1E  CAL_PSF_MAG,      float,        
+# CAL_PSF_MAG_SIG  1E  CAL_PSF_MAG_SIG,  float,        
+# SKY              1E  SKY,              float,        
+# SKY_SIGMA        1E  SKY_SIG,          float,        
+# PSF_CHISQ        1E  PSF_CHISQ,        float,        
+# CR_NSIGMA        1E  CR_NSIGMA,        float,        
+# EXT_NSIGMA       1E  EXT_NSIGMA,       float,        
+# PSF_MAJOR        1E  PSF_MAJOR,        float,        
+# PSF_MINOR        1E  PSF_MINOR,        float,        
+# PSF_THETA        1E  PSF_THETA,        float,        
+# PSF_QF           1E  PSF_QF,           float,        
+# PSF_NDOF         1J  PSF_NDOF,         int,          
+# PSF_NPIX         1J  PSF_NPIX,         int,          
+# MOMENTS_XX       1E  MOMENTS_XX,       float,        
+# MOMENTS_XY       1E  MOMENTS_XY,       float,        
+# MOMENTS_YY       1E  MOMENTS_YY,       float,        
+# N_FRAMES         1I  N_FRAMES,         short,        
+# FLAGS            1J  FLAGS,            int,          

branches/eam_branch_20090208/Ohana/src/libautocode/def/measure-ps1-v1.d

@@ -2 +2 @@
 EXTNAME      DVO_MEASURE_PS1_V1
 TYPE         BINTABLE
-SIZE         146
+SIZE         152
 DESCRIPTION  DVO Detection Measurement Table 
 
@@ -27 +27 @@
 
 FIELD t,              TIME,         int,            time in seconds (UNIX)
-FIELD t_msec,         TIME_MSEC,    unsigned short, time fraction of second,       milliseconds
 FIELD averef,         AVE_REF,      unsigned int,   reference to average entry      
 
@@ -33 +32 @@
 FIELD detID,          DET_ID,       unsigned int,   detection ID
 FIELD imageID,        IMAGE_ID,     unsigned int,   reference to DVO image ID
+
 FIELD extID,          EXT_ID,       uint64_t,       external ID (eg PSPS detID)
 
@@ -53 +53 @@
 FIELD Myy,            MYY,          short,          second moments in pixel coords, 1/100 of pixels
 
+# fractional exposure time
+FIELD t_msec,         TIME_MSEC,    unsigned short, time fraction of second,       milliseconds
+FIELD photcode,       PHOTCODE,     unsigned short, photcode
+
 # position errors
 FIELD dXccd,          X_CCD_ERR,    short,          X coord error on chip,          1/100 of pixels
 FIELD dYccd,          Y_CCD_ERR,    short,          Y coord error on chip,          1/100 of pixels
 FIELD posangle,       POSANGLE,     short,          position angle sky to chip,     (0xffff/360) deg
+FIELD pad1,           PAD1,         char[2],        padding
 FIELD pltscale,       PLTSCALE,     float,          plate scale,                    arcsec/pixel
 
-FIELD photcode,       PHOTCODE,     unsigned short, photcode
+FIELD pad2,           PAD2,         char[4],        padding
 FIELD dbFlags,        DB_FLAGS,     uint64_t,       flags supplied by analysis in database
 FIELD photFlags,      PHOT_FLAGS,   uint64_t,       flags supplied by photometry program
 
-# FIELD dummy,          DUMMY,        char[6],        padding
+
+# 19 x float
+# 6 x int or unsigned int
+# 11 x short or unsigned short
+# 3 x uint64_t
+
+# =