Index: /branches/rel10_ifa/psModules/configure.ac =================================================================== --- /branches/rel10_ifa/psModules/configure.ac (revision 6564) +++ /branches/rel10_ifa/psModules/configure.ac (revision 6565) @@ -81,4 +81,8 @@ AM_CONDITIONAL(DOXYGEN, test x$doxygen = xtrue) +dnl libjpeg ------------------------------------------------------------------- + +AC_CHECK_LIB(jpeg,jpeg_CreateCompress,[],[AC_MSG_ERROR([jpeg library not found.])]) + dnl pslib --------------------------------------------------------------------- AC_ARG_WITH(pslib-config, Index: /branches/rel10_ifa/psModules/src/astrom/Makefile.am =================================================================== --- /branches/rel10_ifa/psModules/src/astrom/Makefile.am (revision 6564) +++ /branches/rel10_ifa/psModules/src/astrom/Makefile.am (revision 6565) @@ -13,7 +13,7 @@ pmConceptsWrite.c \ pmConceptsStandard.c -# pmChipMosaic.c # pmFPAfile.c # pmFPAview.c +# pmChipMosaic.c # pmFPAWrite.c # pmFPAAstrometry.c @@ -32,7 +32,7 @@ pmConceptsWrite.h \ pmConceptsStandard.h -# pmChipMosaic.h # pmFPAfile.c # pmFPAview.c +# pmChipMosaic.h # pmFPAWrite.h # pmFPAAstrometry.h Index: /branches/rel10_ifa/psModules/src/astrom/pmFPAfile.c =================================================================== --- /branches/rel10_ifa/psModules/src/astrom/pmFPAfile.c (revision 6564) +++ /branches/rel10_ifa/psModules/src/astrom/pmFPAfile.c (revision 6565) @@ -1,3 +1,6 @@ -# include "pmFPAfile.h" +#include +#include "pslib.h" +#include "pmFPAview.h" +#include "pmFPAfile.h" static void pmPFAfileFree (pmFPAfile *file) Index: /branches/rel10_ifa/psModules/src/objects/Makefile.am =================================================================== --- /branches/rel10_ifa/psModules/src/objects/Makefile.am (revision 6564) +++ /branches/rel10_ifa/psModules/src/objects/Makefile.am (revision 6565) @@ -3,25 +3,25 @@ libpsmoduleobjects_la_CPPFLAGS = $(SRCINC) $(PSMODULE_CFLAGS) -I../pslib/ libpsmoduleobjects_la_LDFLAGS = -release $(PACKAGE_VERSION) -libpsmoduleobjects_la_SOURCES = \ - pmPeaks.c \ - pmMoments.c \ - pmModel.c \ - pmModelGroup.c \ - pmSource.c \ - pmSourceSky.c \ - pmSourceContour.c \ - pmSourceFitModel.c \ - pmSourceFitSet.c \ - pmSourcePhotometry.c \ - pmSourceIO.c \ - pmSourceIO_CMF.c \ - pmSourceIO_CMP.c \ - pmSourceIO_OBJ.c \ - pmSourceIO_SX.c \ - pmPSF.c \ - pmPSFtry.c \ - pmGrowthCurve.c \ - pmFPAviewReadObjects.c \ - pmFPAviewWriteObjects.c +libpsmoduleobjects_la_SOURCES = +# pmPeaks.c \ +# pmMoments.c \ +# pmModel.c \ +# pmModelGroup.c \ +# pmSource.c \ +# pmSourceSky.c \ +# pmSourceContour.c \ +# pmSourceFitModel.c \ +# pmSourceFitSet.c \ +# pmSourcePhotometry.c \ +# pmSourceIO.c \ +# pmSourceIO_CMF.c \ +# pmSourceIO_CMP.c \ +# pmSourceIO_OBJ.c \ +# pmSourceIO_SX.c \ +# pmPSF.c \ +# pmPSFtry.c \ +# pmGrowthCurve.c \ +# pmFPAviewReadObjects.c \ +# pmFPAviewWriteObjects.c EXTRA_DIST = \ @@ -32,17 +32,17 @@ psmoduleincludedir = $(includedir) -psmoduleinclude_HEADERS = \ - pmPeaks.h \ - pmMoments.h \ - pmModel.h \ - pmModelGroup.h \ - pmSource.h \ - pmSourceSky.h \ - pmSourceContour.h \ - pmSourceFitModel.h \ - pmSourceFitSet.h \ - pmSourcePhotometry.h \ - pmSourceIO.h \ - pmPSF.h \ - pmPSFtry.h \ - pmGrowthCurve.h +psmoduleinclude_HEADERS = +# pmPeaks.h \ +# pmMoments.h \ +# pmModel.h \ +# pmModelGroup.h \ +# pmSource.h \ +# pmSourceSky.h \ +# pmSourceContour.h \ +# pmSourceFitModel.h \ +# pmSourceFitSet.h \ +# pmSourcePhotometry.h \ +# pmSourceIO.h \ +# pmPSF.h \ +# pmPSFtry.h \ +# pmGrowthCurve.h Index: /branches/rel10_ifa/psModules/src/objects/models/pmModel_RGAUSS.c =================================================================== --- /branches/rel10_ifa/psModules/src/objects/models/pmModel_RGAUSS.c (revision 6564) +++ /branches/rel10_ifa/psModules/src/objects/models/pmModel_RGAUSS.c (revision 6565) @@ -117,7 +117,7 @@ psVector *params = model->params; - EllipseAxes axes; - EllipseShape shape; - EllipseMoments moments; + psEllipseAxes axes; + psEllipseShape shape; + psEllipseMoments moments; moments.x2 = PS_SQR(source->moments->Sx); @@ -125,6 +125,6 @@ moments.xy = source->moments->Sxy; - axes = EllipseMomentsToAxes(moments); - shape = EllipseAxesToShape(axes); + axes = psEllipseMomentsToAxes(moments); + shape = psEllipseAxesToShape(axes); params->data.F32[0] = source->moments->Sky; Index: /branches/rel10_ifa/psModules/src/objects/models/pmModel_SGAUSS.c =================================================================== --- /branches/rel10_ifa/psModules/src/objects/models/pmModel_SGAUSS.c (revision 6564) +++ /branches/rel10_ifa/psModules/src/objects/models/pmModel_SGAUSS.c (revision 6565) @@ -17,5 +17,5 @@ # define SQ(A)((A)*(A)) -psF64 psImageEllipseContour (EllipseAxes axes, double xc, double yc, psImage *image); +psF64 psImageEllipseContour (psEllipseAxes axes, double xc, double yc, psImage *image); psF64 p_psImageGetElementF64(psImage *a, int i, int j); @@ -99,5 +99,5 @@ // measure the flux for the elliptical contour -psF64 psImageEllipseContour (EllipseAxes axes, double xc, double yc, psImage *image) +psF64 psImageEllipseContour (psEllipseAxes axes, double xc, double yc, psImage *image) { @@ -145,7 +145,7 @@ psF32 *params = model->params->data.F32; - EllipseAxes axes; - EllipseShape shape; - EllipseMoments moments; + psEllipseAxes axes; + psEllipseShape shape; + psEllipseMoments moments; moments.x2 = PS_SQR(sMoments->Sx); @@ -154,6 +154,6 @@ // solve the math to go from Moments To Shape - axes = EllipseMomentsToAxes(moments); - shape = EllipseAxesToShape(axes); + axes = psEllipseMomentsToAxes(moments); + shape = psEllipseAxesToShape(axes); params[0] = sMoments->Sky; @@ -195,7 +195,7 @@ float f1, f2; - EllipseAxes axes; - EllipseShape shape; - EllipseMoments moments; + psEllipseAxes axes; + psEllipseShape shape; + psEllipseMoments moments; moments.x2 = PS_SQR(sMoments->Sx); @@ -204,6 +204,6 @@ // solve the math to go from Moments To Shape - axes = EllipseMomentsToAxes(moments); - shape = EllipseAxesToShape(axes); + axes = psEllipseMomentsToAxes(moments); + shape = psEllipseAxesToShape(axes); params[0] = sMoments->Sky; @@ -264,6 +264,6 @@ psF32 *PAR = params->data.F32; - EllipseAxes axes; - EllipseShape shape; + psEllipseAxes axes; + psEllipseShape shape; if (flux <= 0) @@ -279,5 +279,5 @@ shape.sxy = PAR[6]; - axes = EllipseShapeToAxes (shape); + axes = psEllipseShapeToAxes (shape); psF64 dr = 1.0 / axes.major; psF64 limit = flux / PAR[1]; @@ -323,6 +323,6 @@ psF32 dP; bool status; - EllipseAxes axes; - EllipseShape shape; + psEllipseAxes axes; + psEllipseShape shape; psF32 *PAR = model->params->data.F32; @@ -333,5 +333,5 @@ shape.sxy = PAR[6]; - axes = EllipseShapeToAxes (shape); + axes = psEllipseShapeToAxes (shape); dP = 0; Index: /branches/rel10_ifa/psModules/src/objects/models/pmModel_ZGAUSS.c =================================================================== --- /branches/rel10_ifa/psModules/src/objects/models/pmModel_ZGAUSS.c (revision 6564) +++ /branches/rel10_ifa/psModules/src/objects/models/pmModel_ZGAUSS.c (revision 6565) @@ -85,6 +85,6 @@ psF32 *PAR = params->data.F32; - EllipseAxes axes; - EllipseShape shape; + psEllipseAxes axes; + psEllipseShape shape; if (flux <= 0) @@ -100,5 +100,5 @@ shape.sxy = PAR[6]; - axes = EllipseShapeToAxes (shape); + axes = psEllipseShapeToAxes (shape); psF64 dr = 1.0 / axes.major; psF64 limit = flux / PAR[1]; @@ -124,7 +124,7 @@ psVector *params = model->params; - EllipseAxes axes; - EllipseShape shape; - EllipseMoments moments; + psEllipseAxes axes; + psEllipseShape shape; + psEllipseMoments moments; moments.x2 = PS_SQR(source->moments->Sx); @@ -132,6 +132,6 @@ moments.xy = source->moments->Sxy; - axes = EllipseMomentsToAxes(moments); - shape = EllipseAxesToShape(axes); + axes = psEllipseMomentsToAxes(moments); + shape = psEllipseAxesToShape(axes); params->data.F32[0] = source->moments->Sky; Index: /branches/rel10_ifa/psModules/src/objects/pmObjects.h =================================================================== --- /branches/rel10_ifa/psModules/src/objects/pmObjects.h (revision 6564) +++ /branches/rel10_ifa/psModules/src/objects/pmObjects.h (revision 6565) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.5.4.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-03-08 18:01:07 $ + * @version $Revision: 1.5.4.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-09 04:25:03 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -27,5 +27,4 @@ #include #include "pslib.h" -#include "pmFPA.h" /** Index: /branches/rel10_ifa/psModules/src/objects/pmSourceIO_CMF.c =================================================================== --- /branches/rel10_ifa/psModules/src/objects/pmSourceIO_CMF.c (revision 6564) +++ /branches/rel10_ifa/psModules/src/objects/pmSourceIO_CMF.c (revision 6565) @@ -3,6 +3,6 @@ * @author EAM, IfA * - * @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-03-09 03:14:23 $ + * @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-09 04:25:03 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -39,6 +39,6 @@ float lsky; bool status; - EllipseShape shape; - EllipseAxes axes; + psEllipseShape shape; + psEllipseAxes axes; // find config information for output header @@ -63,5 +63,5 @@ shape.sy = PAR[5]; shape.sxy = PAR[6]; - axes = EllipseShapeToAxes (shape); + axes = psEllipseShapeToAxes (shape); row = psMetadataAlloc (); @@ -98,6 +98,6 @@ bool status; psF32 *PAR, *dPAR; - EllipseShape shape; - EllipseAxes axes; + psEllipseShape shape; + psEllipseAxes axes; float lsky; @@ -140,5 +140,5 @@ axes.theta = psMetadataLookupF32 (&status, row, "THETA"); - shape = EllipseAxesToShape (axes); + shape = psEllipseAxesToShape (axes); PAR[4] = shape.sx; Index: /branches/rel10_ifa/psModules/src/objects/pmSourceIO_CMP.c =================================================================== --- /branches/rel10_ifa/psModules/src/objects/pmSourceIO_CMP.c (revision 6564) +++ /branches/rel10_ifa/psModules/src/objects/pmSourceIO_CMP.c (revision 6565) @@ -3,6 +3,6 @@ * @author EAM, IfA * - * @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-03-09 03:14:23 $ + * @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-09 04:25:03 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -36,6 +36,6 @@ float dmag, lsky; bool status; - EllipseShape shape; - EllipseAxes axes; + psEllipseShape shape; + psEllipseAxes axes; // find config information for output header @@ -90,5 +90,5 @@ shape.sy = PAR[5]; shape.sxy = PAR[6]; - axes = EllipseShapeToAxes (shape); + axes = psEllipseShapeToAxes (shape); psLineInit (line); @@ -120,6 +120,6 @@ psF32 *PAR, *dPAR; bool status; - EllipseShape shape; - EllipseAxes axes; + psEllipseShape shape; + psEllipseAxes axes; // define PSF model type @@ -226,5 +226,5 @@ axes.theta = atof (array->data[10]); - shape = EllipseAxesToShape (axes); + shape = psEllipseAxesToShape (axes); PAR[4] = shape.sx; Index: /branches/rel10_ifa/psModules/src/objects/pmSourceIO_OBJ.c =================================================================== --- /branches/rel10_ifa/psModules/src/objects/pmSourceIO_OBJ.c (revision 6564) +++ /branches/rel10_ifa/psModules/src/objects/pmSourceIO_OBJ.c (revision 6565) @@ -3,6 +3,6 @@ * @author EAM, IfA * - * @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-03-09 03:14:23 $ + * @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-09 04:25:03 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -34,6 +34,6 @@ psF32 *PAR, *dPAR; float dmag, apResid; - EllipseShape shape; - EllipseAxes axes; + psEllipseShape shape; + psEllipseAxes axes; psTimerStart ("string"); @@ -68,5 +68,5 @@ shape.sy = PAR[5]; shape.sxy = PAR[6]; - axes = EllipseShapeToAxes (shape); + axes = psEllipseShapeToAxes (shape); psLineInit (line); Index: /branches/rel10_ifa/psModules/src/objects/pmSourceIO_SX.c =================================================================== --- /branches/rel10_ifa/psModules/src/objects/pmSourceIO_SX.c (revision 6564) +++ /branches/rel10_ifa/psModules/src/objects/pmSourceIO_SX.c (revision 6565) @@ -3,6 +3,6 @@ * @author EAM, IfA * - * @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-03-09 03:14:23 $ + * @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-09 04:25:03 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -32,6 +32,6 @@ psF32 *PAR, *dPAR; - EllipseShape shape; - EllipseAxes axes; + psEllipseShape shape; + psEllipseAxes axes; psLine *line = psLineAlloc (110); // 110 is sextractor line length @@ -58,5 +58,5 @@ shape.sy = PAR[5]; shape.sxy = PAR[6]; - axes = EllipseShapeToAxes (shape); + axes = psEllipseShapeToAxes (shape); psLineInit (line); Index: /branches/rel10_ifa/psModules/src/pslib/Makefile.am =================================================================== --- /branches/rel10_ifa/psModules/src/pslib/Makefile.am (revision 6564) +++ /branches/rel10_ifa/psModules/src/pslib/Makefile.am (revision 6565) @@ -4,5 +4,5 @@ libpsmodulepslib_la_LDFLAGS = -release $(PACKAGE_VERSION) libpsmodulepslib_la_SOURCES = \ - psAdditionals.c \ + psEllipse.c \ psImageJpeg.c \ psLine.c \ @@ -12,5 +12,5 @@ psmoduleincludedir = $(includedir) psmoduleinclude_HEADERS = \ - psAdditionals.h \ + psEllipse.h \ psImageJpeg.h \ psLine.h \ Index: /branches/rel10_ifa/psModules/src/pslib/psEllipse.c =================================================================== --- /branches/rel10_ifa/psModules/src/pslib/psEllipse.c (revision 6564) +++ /branches/rel10_ifa/psModules/src/pslib/psEllipse.c (revision 6565) @@ -2,8 +2,8 @@ # include "psEllipse.h" -EllipseAxes EllipseMomentsToAxes (EllipseMoments moments) +psEllipseAxes psEllipseMomentsToAxes (psEllipseMoments moments) { - EllipseAxes axes; + psEllipseAxes axes; double f = sqrt (0.25*PS_SQR(moments.x2 - moments.y2) + PS_SQR(moments.xy)); @@ -20,8 +20,8 @@ } -EllipseShape EllipseAxesToShape (EllipseAxes axes) +psEllipseShape psEllipseAxesToShape (psEllipseAxes axes) { - EllipseShape shape; + psEllipseShape shape; double r1 = 1.0 / PS_SQR(axes.major) + 1.0 / PS_SQR(axes.minor); @@ -38,8 +38,8 @@ } -EllipseAxes EllipseShapeToAxes (EllipseShape shape) +psEllipseAxes psEllipseShapeToAxes (psEllipseShape shape) { - EllipseAxes axes; + psEllipseAxes axes; double f1 = 1.0 / PS_SQR(shape.sx) + 1.0 / PS_SQR(shape.sy); Index: /branches/rel10_ifa/psModules/src/pslib/psEllipse.h =================================================================== --- /branches/rel10_ifa/psModules/src/pslib/psEllipse.h (revision 6564) +++ /branches/rel10_ifa/psModules/src/pslib/psEllipse.h (revision 6565) @@ -6,5 +6,5 @@ double theta; } -EllipseAxes; +psEllipseAxes; typedef struct @@ -14,5 +14,5 @@ double xy; } -EllipseMoments; +psEllipseMoments; typedef struct @@ -22,9 +22,9 @@ double sxy; } -EllipseShape; +psEllipseShape; // conversions between elliptical shape representations -EllipseAxes EllipseMomentsToAxes (EllipseMoments moments); -EllipseShape EllipseAxesToShape (EllipseAxes axes); -EllipseAxes EllipseShapeToAxes (EllipseShape shape); +psEllipseAxes psEllipseMomentsToAxes (psEllipseMoments moments); +psEllipseShape psEllipseAxesToShape (psEllipseAxes axes); +psEllipseAxes psEllipseShapeToAxes (psEllipseShape shape); Index: /branches/rel10_ifa/psModules/src/psmodules.h =================================================================== --- /branches/rel10_ifa/psModules/src/psmodules.h (revision 6564) +++ /branches/rel10_ifa/psModules/src/psmodules.h (revision 6565) @@ -4,4 +4,9 @@ #include "pslib.h" +#include "psImageJpeg.h" +#include "psLine.h" +#include "psPolynomialUtils.h" +#include "psSparse.h" +#include "psEllipse.h" //#include "pmChipMosaic.h" #include "pmConcepts.h" @@ -9,4 +14,5 @@ #include "pmConceptsStandard.h" #include "pmConceptsWrite.h" +#include "pmHDU.h" #include "pmFPA.h" //#include "pmFPAAstrometry.h" @@ -16,6 +22,4 @@ #include "pmReadout.h" //#include "pmFPAfile.h" -#include "pmConfig.h" -#include "pmHDU.h" //#include "pmFPAview.h" #include "pmConfig.h" @@ -26,15 +30,25 @@ #include "pmNonLinear.h" #include "pmImageCombine.h" -#include "pmReadoutCombine.h" +//#include "pmReadoutCombine.h" #include "pmImageSubtract.h" #include "pmSubtractBias.h" //#include "pmSubtractSky.h" -#include "pmGrowthCurve.h" -#include "pmModelGroup.h" -#include "pmObjects.h" -#include "pmPSF.h" -#include "pmPSFtry.h" -#include "psEllipse.h" +// #include "pmGrowthCurve.h" +// #include "pmObjects.h" +// #include "pmObjectsIO.h" +// #include "pmModel.h" +// #include "pmPSF.h" +// #include "pmPSFtry.h" +// #include "pmMoments.h" +// #include "pmPeaks.h" +// #include "pmSource.h" +// #include "pmSourceContour.h" +// #include "pmSourceFitModel.h" +// #include "pmSourceFitSet.h" +// #include "pmSourcePhotometry.h" +// #include "pmSourceSky.h" +// #include "pmSourceIO.h" +// #include "pmModelGroup.h" #endif