Index: /branches/eam_branches/ipp-20150616/Ohana/src/libautocode/Makefile.Targets =================================================================== --- /branches/eam_branches/ipp-20150616/Ohana/src/libautocode/Makefile.Targets (revision 38483) +++ /branches/eam_branches/ipp-20150616/Ohana/src/libautocode/Makefile.Targets (revision 38484) @@ -55,6 +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)/galphot.$(ARCH).o \ +$(ASRC)/galphot-ps1-v5.$(ARCH).o \ $(ASRC)/missing.$(ARCH).o \ $(ASRC)/photcode.$(ARCH).o \ @@ -167,6 +167,6 @@ $(AINC)/starpar-ps1-v5.h \ $(AINC)/starpar-ps1-sim.h \ -$(AINC)/galshape.h \ -$(AINC)/galshape-ps1-v5.h \ +$(AINC)/galphot.h \ +$(AINC)/galphot-ps1-v5.h \ $(AINC)/missing.h \ $(AINC)/photcode.h \ Index: /branches/eam_branches/ipp-20150616/Ohana/src/libautocode/def/galphot-ps1-v5.d =================================================================== --- /branches/eam_branches/ipp-20150616/Ohana/src/libautocode/def/galphot-ps1-v5.d (revision 38483) +++ /branches/eam_branches/ipp-20150616/Ohana/src/libautocode/def/galphot-ps1-v5.d (revision 38484) @@ -2,22 +2,17 @@ EXTNAME DVO_GALPHOT_PS1_V5 TYPE BINTABLE -SIZE 72 +SIZE 80 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 thetaErr, THETA_ERR, float, angle error FIELD index, INDEX, float, sersic index (if relevant) FIELD chisq, CHISQ, float, fit chisq @@ -30,4 +25,7 @@ FIELD imageID, IMAGE_ID, unsigned int, reference to DVO image ID +FIELD averef, AVEREF, unsigned int, reference to average table +FIELD dummy, DUMMY, unsigned int, filler + FIELD photcode, PHOTCODE, short FIELD modelType, MODEL_TYPE, short, mean lensing smear object E2 Index: /branches/eam_branches/ipp-20150616/Ohana/src/libautocode/def/galphot.d =================================================================== --- /branches/eam_branches/ipp-20150616/Ohana/src/libautocode/def/galphot.d (revision 38483) +++ /branches/eam_branches/ipp-20150616/Ohana/src/libautocode/def/galphot.d (revision 38484) @@ -2,5 +2,5 @@ EXTNAME DVO_GALPHOT TYPE BINTABLE -SIZE 72 +SIZE 80 DESCRIPTION DVO Galaxy Shape Table @@ -25,4 +25,7 @@ FIELD imageID, IMAGE_ID, unsigned int, reference to DVO image ID +FIELD averef, AVEREF, unsigned int, reference to average table +FIELD dummy, DUMMY, unsigned int, filler + FIELD photcode, PHOTCODE, short FIELD modelType, MODEL_TYPE, short, mean lensing smear object E2 Index: /branches/eam_branches/ipp-20150616/Ohana/src/libdvo/src/dvo_catalog.c =================================================================== --- /branches/eam_branches/ipp-20150616/Ohana/src/libdvo/src/dvo_catalog.c (revision 38483) +++ /branches/eam_branches/ipp-20150616/Ohana/src/libdvo/src/dvo_catalog.c (revision 38484) @@ -532,5 +532,5 @@ galphot->minorAxisErr = NAN; galphot->theta = NAN; - galphot->theta_err = NAN; + galphot->thetaErr = NAN; galphot->index = NAN; galphot->chisq = NAN; @@ -541,4 +541,5 @@ galphot->catID = -1; galphot->imageID = -1; + galphot->averef = 0; galphot->photcode = 0; Index: /branches/eam_branches/ipp-20150616/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c =================================================================== --- /branches/eam_branches/ipp-20150616/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c (revision 38483) +++ /branches/eam_branches/ipp-20150616/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c (revision 38484) @@ -990,22 +990,23 @@ out[i].Xfit = in[i].Xfit; - out[i]. Yfit = in[i]. Yfit; - out[i]. mag = in[i]. mag; - out[i]. magErr = in[i]. magErr; - out[i]. majorAxis = in[i]. majorAxis; - out[i]. minorAxis = in[i]. minorAxis; - out[i]. majorAxisErr = in[i]. majorAxisErr; - out[i]. minorAxisErr = in[i]. minorAxisErr; - out[i]. theta = in[i]. theta; - out[i]. theta_err = in[i]. theta_err; - out[i]. index = in[i]. index; - out[i]. chisq = in[i]. chisq; - out[i]. Npix = in[i]. Npix; - out[i]. objID = in[i]. objID; - out[i]. catID = in[i]. catID; - out[i]. detID = in[i]. detID; - out[i]. imageID = in[i]. imageID; - out[i]. photcode = in[i]. photcode; - out[i]. modelType = in[i]. modelType; + out[i].Yfit = in[i].Yfit; + out[i].mag = in[i].mag; + out[i].magErr = in[i].magErr; + out[i].majorAxis = in[i].majorAxis; + out[i].minorAxis = in[i].minorAxis; + out[i].majorAxisErr = in[i].majorAxisErr; + out[i].minorAxisErr = in[i].minorAxisErr; + out[i].theta = in[i].theta; + out[i].thetaErr = in[i].thetaErr; + out[i].index = in[i].index; + out[i].chisq = in[i].chisq; + out[i].Npix = in[i].Npix; + out[i].objID = in[i].objID; + out[i].catID = in[i].catID; + out[i].detID = in[i].detID; + out[i].imageID = in[i].imageID; + out[i].averef = in[i].averef; + out[i].photcode = in[i].photcode; + out[i].modelType = in[i].modelType; } return (out); @@ -1029,5 +1030,5 @@ out[i].minorAxisErr = in[i].minorAxisErr; out[i].theta = in[i].theta; - out[i].theta_err = in[i].theta_err; + out[i].thetaErr = in[i].thetaErr; out[i].index = in[i].index; out[i].chisq = in[i].chisq; @@ -1037,4 +1038,5 @@ out[i].detID = in[i].detID; out[i].imageID = in[i].imageID; + out[i].averef = in[i].averef; out[i].photcode = in[i].photcode; out[i].modelType = in[i].modelType;