Changeset 34131

Timestamp:

Jul 10, 2012, 9:02:01 AM (14 years ago)

Author:

eugene

Message:

adding PS1_V4 DVO schema info

Location:

branches/eam_branches/ipp-20120627/Ohana/src

Files:

• libautocode/Makefile.Targets (modified) (10 diffs)
• libautocode/def/average-ps1-v4.d (added)
• libautocode/def/image-ps1-v4.d (added)
• libautocode/def/measure-ps1-v4.d (added)
• libautocode/def/measure.d (modified) (2 diffs)
• libautocode/def/photcode-ps1-v4.d (added)
• libautocode/def/secfilt-ps1-v4.d (added)
• libautocode/def/secfilt.d (modified) (3 diffs)
• libdvo/src/dvo_convert_PS1_V4.c (added)

branches/eam_branches/ipp-20120627/Ohana/src/libautocode/Makefile.Targets

@@ -11 +11 @@
 $(ASRC)/average-ps1-v2.$(ARCH).o \
 $(ASRC)/average-ps1-v3.$(ARCH).o \
+$(ASRC)/average-ps1-v4.$(ARCH).o \
 $(ASRC)/average-ps1-ref.$(ARCH).o \
 $(ASRC)/secfilt.$(ARCH).o \
@@ -22 +23 @@
 $(ASRC)/secfilt-ps1-v2.$(ARCH).o \
 $(ASRC)/secfilt-ps1-v3.$(ARCH).o \
+$(ASRC)/secfilt-ps1-v4.$(ARCH).o \
 $(ASRC)/secfilt-ps1-ref.$(ARCH).o \
 $(ASRC)/measure.$(ARCH).o \
@@ -33 +35 @@
 $(ASRC)/measure-ps1-v2.$(ARCH).o \
 $(ASRC)/measure-ps1-v3.$(ARCH).o \
+$(ASRC)/measure-ps1-v4.$(ARCH).o \
 $(ASRC)/measure-ps1-ref.$(ARCH).o \
 $(ASRC)/missing.$(ARCH).o \
@@ -43 +46 @@
 $(ASRC)/photcode-ps1-v2.$(ARCH).o \
 $(ASRC)/photcode-ps1-v3.$(ARCH).o \
+$(ASRC)/photcode-ps1-v4.$(ARCH).o \
 $(ASRC)/photcode-ps1-ref.$(ARCH).o \
 $(ASRC)/image.$(ARCH).o \
@@ -55 +59 @@
 $(ASRC)/image-ps1-v2.$(ARCH).o \
 $(ASRC)/image-ps1-v3.$(ARCH).o \
+$(ASRC)/image-ps1-v4.$(ARCH).o \
 $(ASRC)/image-ps1-ref.$(ARCH).o \
 $(ASRC)/regimage.$(ARCH).o \
@@ -90 +95 @@
 $(AINC)/average-ps1-v2.h \
 $(AINC)/average-ps1-v3.h \
+$(AINC)/average-ps1-v4.h \
 $(AINC)/average-ps1-ref.h \
 $(AINC)/secfilt.h \
@@ -101 +107 @@
 $(AINC)/secfilt-ps1-v2.h \
 $(AINC)/secfilt-ps1-v3.h \
+$(AINC)/secfilt-ps1-v4.h \
 $(AINC)/secfilt-ps1-ref.h \
 $(AINC)/measure.h \
@@ -112 +119 @@
 $(AINC)/measure-ps1-v2.h \
 $(AINC)/measure-ps1-v3.h \
+$(AINC)/measure-ps1-v4.h \
 $(AINC)/measure-ps1-ref.h \
 $(AINC)/missing.h \
@@ -122 +130 @@
 $(AINC)/photcode-ps1-v2.h \
 $(AINC)/photcode-ps1-v3.h \
+$(AINC)/photcode-ps1-v4.h \
 $(AINC)/photcode-ps1-ref.h \
 $(AINC)/image.h \
@@ -134 +143 @@
 $(AINC)/image-ps1-v2.h \
 $(AINC)/image-ps1-v3.h \
+$(AINC)/image-ps1-v4.h \
 $(AINC)/image-ps1-ref.h \
 $(AINC)/regimage.h \

branches/eam_branches/ipp-20120627/Ohana/src/libautocode/def/measure.d

@@ -2 +2 @@
 EXTNAME      DVO_MEASURE
 TYPE         BINTABLE
-SIZE         148
+SIZE         160
 DESCRIPTION  DVO Detection Measurement Table 
 
@@ -10 +10 @@
 FIELD Mcal,           M_CAL,        float,          image cal mag,                  mag
 FIELD Map,            M_APER,       float,          aperture mag,                   mag
+FIELD Mkron,          M_KRON,       float,          kron magnitude,                 mag
+FIELD dMkron,         M_KRON_ERR,   float,          kron magnitude error,           mag
 FIELD dM,             MAG_ERR,      float,          mag error,                      mag
 FIELD dMcal,          MAG_CAL_ERR,  float,          systematic calibration error,   mag

branches/eam_branches/ipp-20120627/Ohana/src/libautocode/def/secfilt.d

@@ -2 +2 @@
 EXTNAME      DVO_SECFILT
 TYPE         BINTABLE
-SIZE         32
+SIZE         48
 DESCRIPTION  DVO SecFilt : Secondary Filter Data 
 
@@ -8 +8 @@
 FIELD  M,           MAG,          float,      average mag in this band,              mags
 FIELD  Map,         MAG,          float,      average mag in this band,              mags
+FIELD  Mkron,       MAG_KRON,     float,      ave kron mag in this band,             mags
+FIELD  dMkron,      MAG_KRON_ERR, float,      formal error on average kron mag,      mags
 FIELD  dM,          MAG_ERR,      float,      formal error on average mag,           mags
 FIELD  Xm,          MAG_CHI,      float,      chisq on average mag,                  [100*log(value)]
+FIELD  extNsigma,   EXT_NSIGMA,   float,      mean extendedness in band
 FIELD  flags,       FLAGS,        uint32_t,   photometry flags
 FIELD  Ncode,       NCODE,        short,      number of detections in band
@@ -17 +20 @@
 FIELD  ubercalDist, UBERCAL_DIST, short,      number of images from an ubercal-image
 FIELD  Mstdev,      MAG_STDEV,    short,      standard deviation of measurements,    millimags
+FIELD  dummy,       DUMMY,        char[4],    padding to fill 8-byte boundary
 
 # *** 20090206 : new fields : M_20, M_80; dropped dummy
-# *** 20120302 : new fields : ubercalDist, Map, dummy[2byte]
+# *** 20120302 : new fields : ubercalDist, Map, Mstdev
+# *** 20120710 : new fields : Mkron, dMkron, extNsigma, dummy[4byte]