Index: /trunk/psphot/src/Makefile.am =================================================================== --- /trunk/psphot/src/Makefile.am (revision 12791) +++ /trunk/psphot/src/Makefile.am (revision 12792) @@ -8,5 +8,10 @@ psphot_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PSPHOT_LIBS) psphot_LDADD = libpsphot.la -psphot_SOURCES = psphot.c +psphot_SOURCES = psphot.c \ + psphotArguments.c \ + psphotCleanup.c \ + psphotImageLoop.c \ + psphotMosaicChip.c \ + psphotParseCamera.c libpsphot_la_SOURCES = \ @@ -14,8 +19,4 @@ psphotVersion.c \ psphotModelGroupInit.c \ - psphotArguments.c \ - psphotParseCamera.c \ - psphotMosaicChip.c \ - psphotImageLoop.c \ psphotMaskReadout.c \ psphotReadout.c \ @@ -53,6 +54,5 @@ psphotDeblendSatstars.c \ psphotMosaicSubimage.c \ - psphotAddNoise.c \ - psphotCleanup.c + psphotAddNoise.c @@ -60,4 +60,7 @@ psphot.h \ psphotErrorCodes.h + +noinst_HEADERS = \ + psphotInternal.h clean-local: Index: /trunk/psphot/src/psphot.c =================================================================== --- /trunk/psphot/src/psphot.c (revision 12791) +++ /trunk/psphot/src/psphot.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" static void usage (void) { @@ -10,5 +10,5 @@ psTimerStart ("complete"); psphotErrorRegister(); // register our error codes/messages - psphotModelGroupInit (); // load implementation-specific models + psphotModelGroupInit (); // load implementation-specific models // load command-line arguments, options, and system config data Index: /trunk/psphot/src/psphot.h =================================================================== --- /trunk/psphot/src/psphot.h (revision 12791) +++ /trunk/psphot/src/psphot.h (revision 12792) @@ -3,11 +3,12 @@ # endif -# include -# include // for strcasecmp -# include // for unlink -# include -# include +#ifndef PS_PHOT_H +#define PS_PHOT_H -# include "psphotErrorCodes.h" +#include +#include +#include + +#include "psphotErrorCodes.h" #define PSPHOT_RECIPE "PSPHOT" // Name of the recipe to use @@ -17,97 +18,7 @@ psString psphotVersionLong(void); -// XXX test functions -bool psphotTestPSF (pmReadout *readout, psArray *sources, psMetadata *recipe); -bool pmPSFtestModel (psArray *sources, char *modelName, float RADIUS, bool poissonErrors, psPolynomial2D *psfTrendMask); - -pmConfig *psphotArguments (int argc, char **argv); -bool psphotParseCamera (pmConfig *config); -bool psphotImageLoop (pmConfig *config); -bool psphotMosaicChip(pmConfig *config, const pmFPAview *view, char *outFile, char *inFile); - bool psphotModelTest (pmReadout *readout, psMetadata *recipe); bool psphotReadout (pmConfig *config, pmFPAview *view); -void psphotCleanup (pmConfig *config); - -psArray *psphotFakeSources (); - -// psphotReadout functions -bool psphotImageMedian (pmConfig *config, pmFPAview *view); -psArray *psphotFindPeaks (pmReadout *readout, psMetadata *recipe, int pass); -psArray *psphotSourceStats (pmReadout *readout, psMetadata *recipe, psArray *allpeaks); -bool psphotRoughClass (psArray *sources, psMetadata *recipe); -bool psphotBasicDeblend (psArray *sources, psMetadata *recipe); -pmPSF *psphotChoosePSF (pmReadout *readout, psArray *sources, psMetadata *recipe); -bool psphotPSFstats (pmReadout *readout, psMetadata *recipe, pmPSF *psf); -bool psphotMomentsStats (pmReadout *readout, psMetadata *recipe, psArray *sources); -bool psphotEnsemblePSF (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, bool final); -bool psphotGuessModels (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf); -bool psphotBlendFit (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf); -bool psphotReplaceUnfit (psArray *sources); -bool psphotReplaceAll (psArray *sources); -bool psphotApResid (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf); -bool psphotMagnitudes (psArray *sources, psMetadata *recipe, pmPSF *psf, pmReadout *background); -bool psphotSkyReplace (pmConfig *config, pmFPAview *view); bool psphotReadoutCleanup (pmConfig *config, pmReadout *readout, psMetadata *recipe, pmPSF *psf, psArray *sources); -// basic support functions -void psphotModelGroupInit (void); -int psphotSortBySN (const void **a, const void **b); -int psphotSortByY (const void **a, const void **b); -bool psphotGrowthCurve (pmReadout *readout, pmPSF *psf, bool ignore); -void psphotTestArguments (int *argc, char **argv); -bool psphotMaskReadout (pmReadout *readout, psMetadata *recipe); -void psphotSourceFreePixels (psArray *sources); - -// functions to set the correct source pixels -bool psphotInitRadiusPSF (const psMetadata *recipe, const pmModelType type); -bool psphotCheckRadiusPSF (pmReadout *readout, pmSource *source, pmModel *model); -bool psphotCheckRadiusPSFBlend (pmReadout *readout, pmSource *source, pmModel *model, float dR); -bool psphotInitRadiusEXT (psMetadata *recipe, pmModelType type); -bool psphotCheckRadiusEXT (pmReadout *readout, pmSource *source, pmModel *model); - -// output functions -bool psphotAddPhotcode (psMetadata *recipe, pmConfig *config, pmFPAview *view); -bool psphotDumpMoments (psMetadata *recipe, psArray *sources); -psMetadata *psphotDefineHeader (psMetadata *recipe); -bool psphotWeightBias (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf); -int psphotSaveImage (psMetadata *header, psImage *image, char *filename); -bool psphotDumpConfig (pmConfig *config); -pmReadout *psphotSelectBackground (pmConfig *config, pmFPAview *view); - -// PSF / DBL / EXT evaluation functions -bool psphotEvalPSF (pmSource *source, pmModel *model); -bool psphotEvalDBL (pmSource *source, pmModel *model); -bool psphotEvalEXT (pmSource *source, pmModel *model); - -// functions to support the source fitting process -bool psphotInitLimitsPSF (psMetadata *recipe, pmReadout *readout); -bool psphotInitLimitsEXT (psMetadata *recipe); -bool psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf); -bool psphotFitBlob (pmReadout *readout, pmSource *source, psArray *sources, pmPSF *psf); -bool psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf); -pmModel *psphotFitEXT (pmReadout *readout, pmSource *source); -psArray *psphotFitDBL (pmReadout *readout, pmSource *source); - -// functions to support simultaneous multi-source fitting -bool psphotFitSet (pmSource *oneSrc, pmModel *oneModel, char *fitset, pmSourceFitMode mode); - -// plotting functions (available if libkapa is installed) -bool psphotPlotMoments (pmConfig *config, pmFPAview *view, psArray *sources); -bool psphotPlotPSFModel (pmConfig *config, pmFPAview *view, psArray *sources); - -bool psphotFitInit (); -bool psphotFitSummary (); -bool psphotMergeSources (psArray *oldSources, psArray *newSources); -bool psphotLoadExtSources (pmConfig *config, pmFPAview *view, psArray *sources); -psExit psphotGetExitStatus (); -bool psphotSetHeaderNstars (psMetadata *recipe, psArray *sources); -bool psphotAddNoise (pmReadout *readout, psArray *sources, psMetadata *recipe, bool add); -bool psphotRadialPlot (int *kapa, char *filename, pmSource *source); -bool psphotSourcePlots (pmReadout *readout, psArray *sources, psMetadata *recipe); -bool psphotMosaicSubimage (psImage *outImage, pmSource *source, int Xo, int Yo, int DX, int DY); - -bool psphotAddWithTest (pmSource *source, bool useState); -bool psphotSubWithTest (pmSource *source, bool useState); -bool psphotSetState (pmSource *source, bool curState); -bool psphotDeblendSatstars (psArray *sources, psMetadata *recipe); +#endif Index: /trunk/psphot/src/psphotAddNoise.c =================================================================== --- /trunk/psphot/src/psphotAddNoise.c (revision 12791) +++ /trunk/psphot/src/psphotAddNoise.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" bool psphotAddNoise (pmReadout *readout, psArray *sources, psMetadata *recipe, bool add) { Index: /trunk/psphot/src/psphotApResid.c =================================================================== --- /trunk/psphot/src/psphotApResid.c (revision 12791) +++ /trunk/psphot/src/psphotApResid.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // XXXX this code fails if there are too few sources to measure the aperture residual // the larger problem is that the rules for accepting more polynomial terms are weak. Index: /trunk/psphot/src/psphotArguments.c =================================================================== --- /trunk/psphot/src/psphotArguments.c (revision 12791) +++ /trunk/psphot/src/psphotArguments.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" pmConfig *psphotArguments(int argc, char **argv) { Index: /trunk/psphot/src/psphotBasicDeblend.c =================================================================== --- /trunk/psphot/src/psphotBasicDeblend.c (revision 12791) +++ /trunk/psphot/src/psphotBasicDeblend.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" bool psphotBasicDeblend (psArray *sources, psMetadata *recipe) { Index: /trunk/psphot/src/psphotBlendFit.c =================================================================== --- /trunk/psphot/src/psphotBlendFit.c (revision 12791) +++ /trunk/psphot/src/psphotBlendFit.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // XXX I don't like this name Index: /trunk/psphot/src/psphotChoosePSF.c =================================================================== --- /trunk/psphot/src/psphotChoosePSF.c (revision 12791) +++ /trunk/psphot/src/psphotChoosePSF.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // try PSF models and select best option Index: /trunk/psphot/src/psphotCleanup.c =================================================================== --- /trunk/psphot/src/psphotCleanup.c (revision 12791) +++ /trunk/psphot/src/psphotCleanup.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" void psphotCleanup (pmConfig *config) { Index: /trunk/psphot/src/psphotDeblendSatstars.c =================================================================== --- /trunk/psphot/src/psphotDeblendSatstars.c (revision 12791) +++ /trunk/psphot/src/psphotDeblendSatstars.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" bool psphotDeblendSatstars (psArray *sources, psMetadata *recipe) { Index: /trunk/psphot/src/psphotEnsemblePSF.c =================================================================== --- /trunk/psphot/src/psphotEnsemblePSF.c (revision 12791) +++ /trunk/psphot/src/psphotEnsemblePSF.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // fit flux (and optionally sky model) to all reasonable sources Index: /trunk/psphot/src/psphotEvalFLT.c =================================================================== --- /trunk/psphot/src/psphotEvalFLT.c (revision 12791) +++ /trunk/psphot/src/psphotEvalFLT.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" bool psphotEvalEXT (pmSource *source, pmModel *model) Index: /trunk/psphot/src/psphotEvalPSF.c =================================================================== --- /trunk/psphot/src/psphotEvalPSF.c (revision 12791) +++ /trunk/psphot/src/psphotEvalPSF.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // given a pmSource which has been fitted using modelPSF, evaluate the Index: /trunk/psphot/src/psphotFakeSources.c =================================================================== --- /trunk/psphot/src/psphotFakeSources.c (revision 12791) +++ /trunk/psphot/src/psphotFakeSources.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" psArray *psphotFakeSources () { Index: /trunk/psphot/src/psphotFindPeaks.c =================================================================== --- /trunk/psphot/src/psphotFindPeaks.c (revision 12791) +++ /trunk/psphot/src/psphotFindPeaks.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // In this function, we smooth the image, then search for the peaks Index: /trunk/psphot/src/psphotFitSet.c =================================================================== --- /trunk/psphot/src/psphotFitSet.c (revision 12791) +++ /trunk/psphot/src/psphotFitSet.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // XXX this is not used in main psphot code Index: /trunk/psphot/src/psphotGrowthCurve.c =================================================================== --- /trunk/psphot/src/psphotGrowthCurve.c (revision 12791) +++ /trunk/psphot/src/psphotGrowthCurve.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // XXX we can probably move this into pmGrowthCurve.c Index: /trunk/psphot/src/psphotGuessModels.c =================================================================== --- /trunk/psphot/src/psphotGuessModels.c (revision 12791) +++ /trunk/psphot/src/psphotGuessModels.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // construct an initial PSF model for each object Index: /trunk/psphot/src/psphotImageLoop.c =================================================================== --- /trunk/psphot/src/psphotImageLoop.c (revision 12791) +++ /trunk/psphot/src/psphotImageLoop.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" bool psphotImageLoop (pmConfig *config) { Index: /trunk/psphot/src/psphotImageMedian.c =================================================================== --- /trunk/psphot/src/psphotImageMedian.c (revision 12791) +++ /trunk/psphot/src/psphotImageMedian.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" static int npass = 0; Index: /trunk/psphot/src/psphotInternal.h =================================================================== --- /trunk/psphot/src/psphotInternal.h (revision 12792) +++ /trunk/psphot/src/psphotInternal.h (revision 12792) @@ -0,0 +1,110 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifndef PS_PHOT_INTERNAL_H +#define PS_PHOT_INTERNAL_H + +#include +#include // for strcasecmp +#include // for unlink +#include +#include + +#include "psphot.h" + +// Top level functions +pmConfig *psphotArguments (int argc, char **argv); +bool psphotParseCamera (pmConfig *config); +bool psphotImageLoop (pmConfig *config); +bool psphotMosaicChip(pmConfig *config, const pmFPAview *view, char *outFile, char *inFile); +void psphotCleanup (pmConfig *config); + +// XXX test functions +bool psphotTestPSF (pmReadout *readout, psArray *sources, psMetadata *recipe); +bool pmPSFtestModel (psArray *sources, char *modelName, float RADIUS, bool poissonErrors, psPolynomial2D *psfTrendMask); + +psArray *psphotFakeSources (); + +// psphotReadout functions +bool psphotImageMedian (pmConfig *config, pmFPAview *view); +psArray *psphotFindPeaks (pmReadout *readout, psMetadata *recipe, int pass); +psArray *psphotSourceStats (pmReadout *readout, psMetadata *recipe, psArray *allpeaks); +bool psphotRoughClass (psArray *sources, psMetadata *recipe); +bool psphotBasicDeblend (psArray *sources, psMetadata *recipe); +pmPSF *psphotChoosePSF (pmReadout *readout, psArray *sources, psMetadata *recipe); +bool psphotPSFstats (pmReadout *readout, psMetadata *recipe, pmPSF *psf); +bool psphotMomentsStats (pmReadout *readout, psMetadata *recipe, psArray *sources); +bool psphotEnsemblePSF (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, bool final); +bool psphotGuessModels (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf); +bool psphotBlendFit (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf); +bool psphotReplaceUnfit (psArray *sources); +bool psphotReplaceAll (psArray *sources); +bool psphotApResid (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf); +bool psphotMagnitudes (psArray *sources, psMetadata *recipe, pmPSF *psf, pmReadout *background); +bool psphotSkyReplace (pmConfig *config, pmFPAview *view); + +// basic support functions +void psphotModelGroupInit (void); +int psphotSortBySN (const void **a, const void **b); +int psphotSortByY (const void **a, const void **b); +bool psphotGrowthCurve (pmReadout *readout, pmPSF *psf, bool ignore); +void psphotTestArguments (int *argc, char **argv); +bool psphotMaskReadout (pmReadout *readout, psMetadata *recipe); +void psphotSourceFreePixels (psArray *sources); + +// functions to set the correct source pixels +bool psphotInitRadiusPSF (const psMetadata *recipe, const pmModelType type); +bool psphotCheckRadiusPSF (pmReadout *readout, pmSource *source, pmModel *model); +bool psphotCheckRadiusPSFBlend (pmReadout *readout, pmSource *source, pmModel *model, float dR); +bool psphotInitRadiusEXT (psMetadata *recipe, pmModelType type); +bool psphotCheckRadiusEXT (pmReadout *readout, pmSource *source, pmModel *model); + +// output functions +bool psphotAddPhotcode (psMetadata *recipe, pmConfig *config, pmFPAview *view); +bool psphotDumpMoments (psMetadata *recipe, psArray *sources); +psMetadata *psphotDefineHeader (psMetadata *recipe); +bool psphotWeightBias (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf); +int psphotSaveImage (psMetadata *header, psImage *image, char *filename); +bool psphotDumpConfig (pmConfig *config); +pmReadout *psphotSelectBackground (pmConfig *config, pmFPAview *view); + +// PSF / DBL / EXT evaluation functions +bool psphotEvalPSF (pmSource *source, pmModel *model); +bool psphotEvalDBL (pmSource *source, pmModel *model); +bool psphotEvalEXT (pmSource *source, pmModel *model); + +// functions to support the source fitting process +bool psphotInitLimitsPSF (psMetadata *recipe, pmReadout *readout); +bool psphotInitLimitsEXT (psMetadata *recipe); +bool psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf); +bool psphotFitBlob (pmReadout *readout, pmSource *source, psArray *sources, pmPSF *psf); +bool psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf); +pmModel *psphotFitEXT (pmReadout *readout, pmSource *source); +psArray *psphotFitDBL (pmReadout *readout, pmSource *source); + +// functions to support simultaneous multi-source fitting +bool psphotFitSet (pmSource *oneSrc, pmModel *oneModel, char *fitset, pmSourceFitMode mode); + +// plotting functions (available if libkapa is installed) +bool psphotPlotMoments (pmConfig *config, pmFPAview *view, psArray *sources); +bool psphotPlotPSFModel (pmConfig *config, pmFPAview *view, psArray *sources); + +bool psphotFitInit (); +bool psphotFitSummary (); +bool psphotMergeSources (psArray *oldSources, psArray *newSources); +bool psphotLoadExtSources (pmConfig *config, pmFPAview *view, psArray *sources); +psExit psphotGetExitStatus (); +bool psphotSetHeaderNstars (psMetadata *recipe, psArray *sources); +bool psphotAddNoise (pmReadout *readout, psArray *sources, psMetadata *recipe, bool add); +bool psphotRadialPlot (int *kapa, char *filename, pmSource *source); +bool psphotSourcePlots (pmReadout *readout, psArray *sources, psMetadata *recipe); +bool psphotMosaicSubimage (psImage *outImage, pmSource *source, int Xo, int Yo, int DX, int DY); + +bool psphotAddWithTest (pmSource *source, bool useState); +bool psphotSubWithTest (pmSource *source, bool useState); +bool psphotSetState (pmSource *source, bool curState); +bool psphotDeblendSatstars (psArray *sources, psMetadata *recipe); + + +#endif Index: /trunk/psphot/src/psphotMagnitudes.c =================================================================== --- /trunk/psphot/src/psphotMagnitudes.c (revision 12791) +++ /trunk/psphot/src/psphotMagnitudes.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" bool psphotMagnitudes(psArray *sources, Index: /trunk/psphot/src/psphotMaskReadout.c =================================================================== --- /trunk/psphot/src/psphotMaskReadout.c (revision 12791) +++ /trunk/psphot/src/psphotMaskReadout.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" bool psphotMaskReadout (pmReadout *readout, psMetadata *recipe) { Index: /trunk/psphot/src/psphotMergeSources.c =================================================================== --- /trunk/psphot/src/psphotMergeSources.c (revision 12791) +++ /trunk/psphot/src/psphotMergeSources.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // add newly selected sources to the existing list of sources Index: /trunk/psphot/src/psphotModelGroupInit.c =================================================================== --- /trunk/psphot/src/psphotModelGroupInit.c (revision 12791) +++ /trunk/psphot/src/psphotModelGroupInit.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // Add locally-defined models here. As these mature, they can be moved to Index: /trunk/psphot/src/psphotModelTest.c =================================================================== --- /trunk/psphot/src/psphotModelTest.c (revision 12791) +++ /trunk/psphot/src/psphotModelTest.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" static char DEFAULT_MODE[] = "EXT"; Index: /trunk/psphot/src/psphotMosaicChip.c =================================================================== --- /trunk/psphot/src/psphotMosaicChip.c (revision 12791) +++ /trunk/psphot/src/psphotMosaicChip.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" bool psphotMosaicChip(pmConfig *config, const pmFPAview *view, char *outFile, char *inFile) Index: /trunk/psphot/src/psphotMosaicSubimage.c =================================================================== --- /trunk/psphot/src/psphotMosaicSubimage.c (revision 12791) +++ /trunk/psphot/src/psphotMosaicSubimage.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // insert the source image into the outimage at Xo, Yo Index: /trunk/psphot/src/psphotOutput.c =================================================================== --- /trunk/psphot/src/psphotOutput.c (revision 12791) +++ /trunk/psphot/src/psphotOutput.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" pmReadout *psphotSelectBackground (pmConfig *config, pmFPAview *view) { Index: /trunk/psphot/src/psphotPSFResiduals.c =================================================================== --- /trunk/psphot/src/psphotPSFResiduals.c (revision 12791) +++ /trunk/psphot/src/psphotPSFResiduals.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // construct an initial PSF model for each object Index: /trunk/psphot/src/psphotParseCamera.c =================================================================== --- /trunk/psphot/src/psphotParseCamera.c (revision 12791) +++ /trunk/psphot/src/psphotParseCamera.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // define the needed / desired I/O files Index: /trunk/psphot/src/psphotRadialPlot.c =================================================================== --- /trunk/psphot/src/psphotRadialPlot.c (revision 12791) +++ /trunk/psphot/src/psphotRadialPlot.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // this variable is defined in psmodules.h if ohana-config is found Index: /trunk/psphot/src/psphotRadiusChecks.c =================================================================== --- /trunk/psphot/src/psphotRadiusChecks.c (revision 12791) +++ /trunk/psphot/src/psphotRadiusChecks.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" # define RADIUS_TYPE int Index: /trunk/psphot/src/psphotReadout.c =================================================================== --- /trunk/psphot/src/psphotReadout.c (revision 12791) +++ /trunk/psphot/src/psphotReadout.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" bool psphotReadout (pmConfig *config, pmFPAview *view) { Index: /trunk/psphot/src/psphotReadoutCleanup.c =================================================================== --- /trunk/psphot/src/psphotReadoutCleanup.c (revision 12791) +++ /trunk/psphot/src/psphotReadoutCleanup.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // psphotReadoutCleanup is called on exit from psphotReadout if the last raised Index: /trunk/psphot/src/psphotReplaceUnfit.c =================================================================== --- /trunk/psphot/src/psphotReplaceUnfit.c (revision 12791) +++ /trunk/psphot/src/psphotReplaceUnfit.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" bool psphotReplaceUnfit (psArray *sources) { Index: /trunk/psphot/src/psphotRoughClass.c =================================================================== --- /trunk/psphot/src/psphotRoughClass.c (revision 12791) +++ /trunk/psphot/src/psphotRoughClass.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // 2006.02.02 : no leaks Index: /trunk/psphot/src/psphotSkyReplace.c =================================================================== --- /trunk/psphot/src/psphotSkyReplace.c (revision 12791) +++ /trunk/psphot/src/psphotSkyReplace.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // XXX make this an option? Index: /trunk/psphot/src/psphotSortBySN.c =================================================================== --- /trunk/psphot/src/psphotSortBySN.c (revision 12791) +++ /trunk/psphot/src/psphotSortBySN.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // sort by SN (descending) Index: /trunk/psphot/src/psphotSourceFits.c =================================================================== --- /trunk/psphot/src/psphotSourceFits.c (revision 12791) +++ /trunk/psphot/src/psphotSourceFits.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // given a source with an existing modelPSF, attempt a full PSF fit, subtract if successful Index: /trunk/psphot/src/psphotSourceFreePixels.c =================================================================== --- /trunk/psphot/src/psphotSourceFreePixels.c (revision 12791) +++ /trunk/psphot/src/psphotSourceFreePixels.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" void psphotSourceFreePixels (psArray *sources) { Index: /trunk/psphot/src/psphotSourcePlots.c =================================================================== --- /trunk/psphot/src/psphotSourcePlots.c (revision 12791) +++ /trunk/psphot/src/psphotSourcePlots.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" bool psphotSourcePlots (pmReadout *readout, psArray *sources, psMetadata *recipe) { Index: /trunk/psphot/src/psphotSourceStats.c =================================================================== --- /trunk/psphot/src/psphotSourceStats.c (revision 12791) +++ /trunk/psphot/src/psphotSourceStats.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" psArray *psphotSourceStats (pmReadout *readout, psMetadata *recipe, psArray *peaks) Index: /trunk/psphot/src/psphotSummaryPlots.c =================================================================== --- /trunk/psphot/src/psphotSummaryPlots.c (revision 12791) +++ /trunk/psphot/src/psphotSummaryPlots.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // the top portion of this file defines plotting functions which use kapa for plotting. Index: /trunk/psphot/src/psphotTest.c =================================================================== --- /trunk/psphot/src/psphotTest.c (revision 12791) +++ /trunk/psphot/src/psphotTest.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" void psExit (int status, char *process, char *format, ...) { Index: /trunk/psphot/src/psphotTestArguments.c =================================================================== --- /trunk/psphot/src/psphotTestArguments.c (revision 12791) +++ /trunk/psphot/src/psphotTestArguments.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" static int usage (); Index: /trunk/psphot/src/psphotTestPSF.c =================================================================== --- /trunk/psphot/src/psphotTestPSF.c (revision 12791) +++ /trunk/psphot/src/psphotTestPSF.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" bool psphotTestPSF (pmReadout *readout, psArray *sources, psMetadata *recipe) { Index: /trunk/psphot/src/psphotVersion.c =================================================================== --- /trunk/psphot/src/psphotVersion.c (revision 12791) +++ /trunk/psphot/src/psphotVersion.c (revision 12792) @@ -1,3 +1,3 @@ -#include "psphot.h" +#include "psphotInternal.h" # if (HAVE_KAPA) Index: /trunk/psphot/src/psphotWeightBias.c =================================================================== --- /trunk/psphot/src/psphotWeightBias.c (revision 12791) +++ /trunk/psphot/src/psphotWeightBias.c (revision 12792) @@ -1,3 +1,3 @@ -# include "psphot.h" +# include "psphotInternal.h" // select objects fitted with PSF model