Index: /branches/eam_branches/ohana.20150429/src/libautocode/Makefile.Targets =================================================================== --- /branches/eam_branches/ohana.20150429/src/libautocode/Makefile.Targets (revision 38217) +++ /branches/eam_branches/ohana.20150429/src/libautocode/Makefile.Targets (revision 38218) @@ -55,4 +55,6 @@ $(ASRC)/starpar-ps1-v5.$(ARCH).o \ $(ASRC)/starpar-ps1-sim.$(ARCH).o \ +$(ASRC)/galshape.$(ARCH).o \ +$(ASRC)/galshape-ps1-v5.$(ARCH).o \ $(ASRC)/missing.$(ARCH).o \ $(ASRC)/photcode.$(ARCH).o \ Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v1.d =================================================================== --- /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v1.d (revision 38217) +++ /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v1.d (revision 38218) @@ -26,5 +26,5 @@ FIELD Nmeasure, NMEASURE, unsigned short, number of psf measurements FIELD Nmissing, NMISSING, unsigned short, number of missings -FIELD Nextend, NEXTEND, unsigned short, number of extended measurements +FIELD Ngalshape, NGALSHAPE, unsigned short, number of galshape measurements FIELD measureOffset, OFF_MEASURE, uint32_t, offset to first psf measurement Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v2.d =================================================================== --- /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v2.d (revision 38217) +++ /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v2.d (revision 38218) @@ -31,5 +31,5 @@ FIELD Nmeasure, NMEASURE, unsigned short, number of psf measurements FIELD Nmissing, NMISSING, unsigned short, number of missings -FIELD Nextend, NEXTEND, unsigned short, number of extended measurements +FIELD Ngalshape, NGALSHAPE, unsigned short, number of galshape measurements FIELD measureOffset, OFF_MEASURE, uint32_t, offset to first psf measurement Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v3.d =================================================================== --- /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v3.d (revision 38217) +++ /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v3.d (revision 38218) @@ -31,5 +31,5 @@ FIELD Nmeasure, NMEASURE, unsigned short, number of psf measurements FIELD Nmissing, NMISSING, unsigned short, number of missings -FIELD Nextend, NEXTEND, unsigned short, number of extended measurements +FIELD Ngalshape, NGALSHAPE, unsigned short, number of galshape measurements FIELD measureOffset, OFF_MEASURE, uint32_t, offset to first psf measurement Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v4.d =================================================================== --- /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v4.d (revision 38217) +++ /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v4.d (revision 38218) @@ -34,5 +34,5 @@ FIELD Nmeasure, NMEASURE, unsigned short, number of psf measurements FIELD Nmissing, NMISSING, unsigned short, number of missings -FIELD Nextend, NEXTEND, unsigned short, number of extended measurements +FIELD Ngalshape, NGALSHAPE, unsigned short, number of galshaped measurements FIELD measureOffset, OFF_MEASURE, uint32_t, offset to first psf measurement Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v5.d =================================================================== --- /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v5.d (revision 38217) +++ /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v5.d (revision 38218) @@ -41,12 +41,12 @@ 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 Ngalshape, NGALSHAPE, unsigned short, number of galshape measurements -FIELD measureOffset, OFF_MEASURE, int, offset to first psf measurement -FIELD missingOffset, OFF_MISSING, int, offset to first missing obs -FIELD lensingOffset, OFF_LENSING, int, offset to first lensing obs -FIELD lensobjOffset, OFF_LENSOBJ, int, offset to mean lensing data -FIELD starparOffset, OFF_STARPAR, int, offset to stellar parameter data -FIELD extendOffset, OFF_EXTEND, int, offset to extended object entry +FIELD measureOffset, OFF_MEASURE, int, offset to first psf measurement +FIELD missingOffset, OFF_MISSING, int, offset to first missing obs +FIELD lensingOffset, OFF_LENSING, int, offset to first lensing obs +FIELD lensobjOffset, OFF_LENSOBJ, int, offset to mean lensing data +FIELD starparOffset, OFF_STARPAR, int, offset to stellar parameter data +FIELD galshapeOffset, OFF_GALSHAPE, int, offset to galshape object entry FIELD refColorBlue, REF_COLOR_BLUE, float, color of astrometry ref stars Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/average.d =================================================================== --- /branches/eam_branches/ohana.20150429/src/libautocode/def/average.d (revision 38217) +++ /branches/eam_branches/ohana.20150429/src/libautocode/def/average.d (revision 38218) @@ -41,12 +41,12 @@ 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 Ngalshape, NGALSHAPE, unsigned short, number of galshape measurements -FIELD measureOffset, OFF_MEASURE, int, offset to first psf measurement -FIELD missingOffset, OFF_MISSING, int, offset to first missing obs -FIELD lensingOffset, OFF_LENSING, int, offset to first lensing obs -FIELD lensobjOffset, OFF_LENSOBJ, int, offset to mean lensing data -FIELD starparOffset, OFF_STARPAR, int, offset to stellar parameter data -FIELD extendOffset, OFF_EXTEND, int, offset to extended object entry +FIELD measureOffset, OFF_MEASURE, int, offset to first psf measurement +FIELD missingOffset, OFF_MISSING, int, offset to first missing obs +FIELD lensingOffset, OFF_LENSING, int, offset to first lensing obs +FIELD lensobjOffset, OFF_LENSOBJ, int, offset to mean lensing data +FIELD starparOffset, OFF_STARPAR, int, offset to stellar parameter data +FIELD galshapeOffset, OFF_GALSHAPE, int, offset to extended object entry FIELD refColorBlue, REF_COLOR_BLUE, float, color of astrometry ref stars Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/galshape-ps1-v5.d =================================================================== --- /branches/eam_branches/ohana.20150429/src/libautocode/def/galshape-ps1-v5.d (revision 38218) +++ /branches/eam_branches/ohana.20150429/src/libautocode/def/galshape-ps1-v5.d (revision 38218) @@ -0,0 +1,33 @@ +STRUCT GalShape_PS1_V5 +EXTNAME DVO_GALSHAPE_PS1_V5 +TYPE BINTABLE +SIZE 72 +DESCRIPTION DVO Galaxy Shape Table + +FIELD Xfit, XFIT, float, centroid for fit +FIELD Yfit, YFIT, float, centroid for fit + +FIELD mag, MAG, float, galaxy magnitude +FIELD magErr, MAG_ERR, float, galaxy magnitude error + +FIELD majorAxis, MAJOR_AXIS, float, major axis size +FIELD minorAxis, MINOR_AXIS, float, minor axis size + +FIELD majorAxisErr, MAJOR_AXIS_ERR, float, major axis size error +FIELD minorAxisErr, MINOR_AXIS_ERR, float, minor axis size error + +FIELD theta, THETA, float, angle +FIELD theta_err, THETA_ERR, float, angle error + +FIELD index, INDEX, float, sersic index (if relevant) +FIELD chisq, CHISQ, float, fit chisq + +FIELD Npix, NPIX, float, fitted pixels + +FIELD objID, OBJ_ID, unsigned int, unique ID for object in table +FIELD catID, CAT_ID, unsigned int, unique ID for table in which object was first realized +FIELD detID, DET_ID, unsigned int, detection ID +FIELD imageID, IMAGE_ID, unsigned int, reference to DVO image ID + +FIELD photcode, PHOTCODE, short +FIELD modelType, MODEL_TYPE, short, mean lensing smear object E2 Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/galshape.d =================================================================== --- /branches/eam_branches/ohana.20150429/src/libautocode/def/galshape.d (revision 38218) +++ /branches/eam_branches/ohana.20150429/src/libautocode/def/galshape.d (revision 38218) @@ -0,0 +1,33 @@ +STRUCT GalShape +EXTNAME DVO_GALSHAPE +TYPE BINTABLE +SIZE 72 +DESCRIPTION DVO Galaxy Shape Table + +FIELD Xfit, XFIT, float, centroid for fit +FIELD Yfit, YFIT, float, centroid for fit + +FIELD mag, MAG, float, galaxy magnitude +FIELD magErr, MAG_ERR, float, galaxy magnitude error + +FIELD majorAxis, MAJOR_AXIS, float, major axis size +FIELD minorAxis, MINOR_AXIS, float, minor axis size + +FIELD majorAxisErr, MAJOR_AXIS_ERR, float, major axis size error +FIELD minorAxisErr, MINOR_AXIS_ERR, float, minor axis size error + +FIELD theta, THETA, float, angle +FIELD theta_err, THETA_ERR, float, angle error + +FIELD index, INDEX, float, sersic index (if relevant) +FIELD chisq, CHISQ, float, fit chisq + +FIELD Npix, NPIX, float, fitted pixels + +FIELD objID, OBJ_ID, unsigned int, unique ID for object in table +FIELD catID, CAT_ID, unsigned int, unique ID for table in which object was first realized +FIELD detID, DET_ID, unsigned int, detection ID +FIELD imageID, IMAGE_ID, unsigned int, reference to DVO image ID + +FIELD photcode, PHOTCODE, short +FIELD modelType, MODEL_TYPE, short, mean lensing smear object E2 Index: /branches/eam_branches/ohana.20150429/src/libdvo/include/dvo.h =================================================================== --- /branches/eam_branches/ohana.20150429/src/libdvo/include/dvo.h (revision 38217) +++ /branches/eam_branches/ohana.20150429/src/libdvo/include/dvo.h (revision 38218) @@ -55,27 +55,33 @@ /* catalog values to be loaded */ -# define LOAD_NONE 0x0000 -# define LOAD_AVES 0x0001 -# define LOAD_MEAS 0x0002 -# define LOAD_MISS 0x0004 -# define LOAD_SECF 0x0008 -# define SKIP_AVES 0x0010 -# define SKIP_MEAS 0x0020 -# define SKIP_MISS 0x0040 -# define SKIP_SECF 0x0080 -# define LOAD_LENSING 0x0100 -# define LOAD_LENSOBJ 0x0200 -# define SKIP_LENSING 0x0400 -# define SKIP_LENSOBJ 0x0800 -# define LOAD_STARPAR 0x1000 -# define SKIP_STARPAR 0x2000 +typedef enum { + LOAD_NONE = 0x0000, + LOAD_AVES = 0x0001, + LOAD_MEAS = 0x0002, + LOAD_MISS = 0x0004, + LOAD_SECF = 0x0008, + SKIP_AVES = 0x0010, + SKIP_MEAS = 0x0020, + SKIP_MISS = 0x0040, + SKIP_SECF = 0x0080, + LOAD_LENSING = 0x0100, + LOAD_LENSOBJ = 0x0200, + SKIP_LENSING = 0x0400, + SKIP_LENSOBJ = 0x0800, + LOAD_STARPAR = 0x1000, + SKIP_STARPAR = 0x2000, + LOAD_GALSHAPE = 0x4000, + SKIP_GALSHAPE = 0x8000, +} DVOCatFlags; /* photometry code types */ // # define PHOT_PRI 0x01 -# define PHOT_SEC 0x02 -# define PHOT_DEP 0x03 -# define PHOT_REF 0x04 -# define PHOT_ALT 0x05 /* never stored, only for look-ups */ -# define PHOT_MAG 0x06 /* generic magnitude; never stored */ +typedef enum { + PHOT_SEC = 0x02, + PHOT_DEP = 0x03, + PHOT_REF = 0x04, + PHOT_ALT = 0x05, /* never stored, only for look-ups */ + PHOT_MAG = 0x06, /* generic magnitude; never stored */ +} DVOPhotCodeTypes; /* Image.code values -- these values are 32 bit (as of PS1_V1) */ @@ -704,8 +710,8 @@ unsigned short Nlensing; // number of lensing measurements unsigned short Nlensobj; // number of lensing measurements - unsigned short Nextend; // number of extended measurements + unsigned short Ngalshape; // number of galshape measurements int measureOffset; // offset to first psf measurement int missingOffset; // offset to first missing obs - int lensingOffset; // offset to first lensing obs + int galshapeOffset; // offset to first lensing obs int lensobjOffset; // offset to mean lensing data int extendOffset; // offset to extended object entry @@ -742,12 +748,13 @@ // lensing data (optional?) - Lensing *lensing; - Lensobj *lensobj; - StarPar *starpar; + Lensing *lensing; + Lensobj *lensobj; + StarPar *starpar; + GalShape *galshape; int Nsecfilt; /* number of secfilt entries for each average entry */ - off_t Naverage, Nmeasure, Nmissing, Nlensing, Nlensobj, Nstarpar, Nsecf_mem; /* current number of each component in memory */ - off_t Naves_disk, Nmeas_disk, Nmiss_disk, Nlensing_disk, Nlensobj_disk, Nstarpar_disk, Nsecf_disk; /* current number of each component on disk */ - off_t Naves_off, Nmeas_off, Nmiss_off, Nlensing_off, Nlensobj_off, Nstarpar_off, Nsecf_off; /* index of first loaded data value */ + off_t Naverage, Nmeasure, Nmissing, Nlensing, Nlensobj, Nstarpar, Ngalshape, Nsecf_mem; /* current number of each component in memory */ + off_t Naves_disk, Nmeas_disk, Nmiss_disk, Nlensing_disk, Nlensobj_disk, Nstarpar_disk, Ngalshape_disk, Nsecf_disk; /* current number of each component on disk */ + off_t Naves_off, Nmeas_off, Nmiss_off, Nlensing_off, Nlensobj_off, Nstarpar_off, Ngalshape_off, Nsecf_off; /* index of first loaded data value */ // note that we use these for the full-sky relphot analysis @@ -765,10 +772,11 @@ /* pointers to split data files */ - struct Catalog *measure_catalog; /* measure catalog data (split) */ - struct Catalog *missing_catalog; /* missing catalog data (split) */ - struct Catalog *secfilt_catalog; /* secfilt catalog data (split) */ - struct Catalog *lensing_catalog; /* lensing catalog data (split) */ - struct Catalog *lensobj_catalog; /* lensobj catalog data (split) */ - struct Catalog *starpar_catalog; /* starpar catalog data (split) */ + struct Catalog *measure_catalog; /* measure catalog data (split) */ + struct Catalog *missing_catalog; /* missing catalog data (split) */ + struct Catalog *secfilt_catalog; /* secfilt catalog data (split) */ + struct Catalog *lensing_catalog; /* lensing catalog data (split) */ + struct Catalog *lensobj_catalog; /* lensobj catalog data (split) */ + struct Catalog *starpar_catalog; /* starpar catalog data (split) */ + struct Catalog *galshape_catalog; /* galshape catalog data (split) */ unsigned int objID; @@ -781,5 +789,5 @@ int sorted; /* is measure table average-sorted? (NOTE this is an int only because gfits_scan %t requires it) */ - short catflags; /* choices to be loaded */ + DVOCatFlags catflags; /* choices to be loaded */ /* pointers for data manipulation */ @@ -1106,4 +1114,5 @@ void dvo_lensobj_init (Lensobj *lensobj, int toZero); void dvo_starpar_init (StarPar *starpar); +void dvo_galshape_init (GalShape *galshape); void InitRegionHosts (RegionHostInfo *hosts, int Nhosts, int NHOSTS); Index: /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog.c =================================================================== --- /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog.c (revision 38217) +++ /branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog.c (revision 38218) @@ -131,5 +131,5 @@ average->Nlensobj = 0; average->Nstarpar = 0; - average->Nextend = 0; + average->Ngalshape = 0; average->measureOffset = -1; @@ -138,5 +138,5 @@ average->lensobjOffset = -1; average->starparOffset = -1; - average->extendOffset = -1; + average->galshapeOffset = -1; average->refColorBlue = NAN; @@ -466,4 +466,32 @@ // init all data, or just catalog data +void dvo_galshape_init (GalShape *galshape) { + galshape->Xfit = NAN; + galshape->Yfit = NAN; + galshape->mag = NAN; + galshape->magErr = NAN; + galshape->majorAxis = NAN; + galshape->minorAxis = NAN; + galshape->majorAxisErr = NAN; + galshape->minorAxisErr = NAN; + galshape->theta = NAN; + galshape->theta_err = NAN; + galshape->index = NAN; + galshape->chisq = NAN; + galshape->Npix = 0; + + galshape->detID = -1; + galshape->objID = -1; + galshape->catID = -1; + galshape->imageID = -1; + + galshape->photcode = 0; + galshape->modelType = 0; + + galshape->averef = 0; + galshape->padding = 0; +} + +// init all data, or just catalog data void dvo_catalog_init (Catalog *catalog, int complete) {