Index: trunk/psastro/src/psastro.h
===================================================================
--- trunk/psastro/src/psastro.h	(revision 12718)
+++ trunk/psastro/src/psastro.h	(revision 12806)
@@ -1,15 +1,11 @@
-# ifdef HAVE_CONFIG_H
-# include <config.h>
-# endif
+/* This file defines the library functions available to external programs.  It must be included
+ * by programs which are compiled against psphot functions.
+ */
 
-# include <stdio.h>
-# include <string.h>
-# include <strings.h>  // for strcasecmp
-# include <unistd.h>   // for unlink
-# include <pslib.h>
-# include <psmodules.h>
+# ifndef PSASTRO_H
+# define PSASTRO_H
 
 # include "psastroErrorCodes.h"
-#define PSASTRO_RECIPE "PSASTRO" // Name of the recipe to use
+# define PSASTRO_RECIPE "PSASTRO" // Name of the recipe to use
 
 # define psMemCopy(A)(psMemIncrRefCounter((A)))
@@ -27,9 +23,7 @@
 } pmLumFunc;
 
-pmConfig         *psastroArguments (int argc, char **argv);
-void              psastroCleanup (pmConfig *config, psArray *refs);
-bool              psastroParseCamera (pmConfig *config);
-bool              psastroDataLoad (pmConfig *config);
 bool              psastroDataSave (pmConfig *config);
+bool              psastroDefineFiles (pmConfig *config, pmFPAfile *input);
+bool              psastroAnalysis (pmConfig *config);
 
 bool              psastroConvertFPA (pmFPA *fpa, psMetadata *recipe);
@@ -38,11 +32,9 @@
 bool              psastroAstromGuess (pmConfig *config);
 
-// bool              pmAstromReadWCS (pmFPA *fpa, pmChip *chip, psMetadata *header, double plateScale, bool isMosaic);
-// bool              pmAstromWriteWCS (psPlaneTransform *toFPA, psPlaneDistort *toTPA, psProjection *toSky, psMetadata *header, double plateScale);
 psPlaneDistort   *psPlaneDistortIdentity ();
-bool psPlaneDistortIsIdentity (psPlaneDistort *distort);
+bool              psPlaneDistortIsIdentity (psPlaneDistort *distort);
 
 psArray          *psastroLoadRefstars (pmConfig *config);
-bool              psastroChipAstrom (pmConfig *config, psArray *refs);
+bool              psastroChipAstrom (pmConfig *config);
 bool              psastroOneChip (pmFPA *fpa, pmChip *chip, psArray *refset, psArray *rawset, psMetadata *recipe, psMetadata *updates);
 bool              psastroChooseRefstars (pmConfig *config, psArray *refs);
@@ -56,28 +48,30 @@
 
 // mosaic fitting functions
-bool psastroMosaicGradients (pmFPA *fpa, psMetadata *recipe);
-bool psastroMosaicCommonScale (pmFPA *fpa, psMetadata *recipe);
-bool psastroMosaicAstrom (pmConfig *config, psArray *refs);
-bool psastroMosaicChipAstrom (pmFPA *fpa, psMetadata *recipe, int iteration);
-bool psastroMosaicSetMatch (pmFPA *fpa, psMetadata *recipe, int iteration);
-bool psastroMosaicSetAstrom (pmFPA *fpa);
-bool psastroMosaicHeaders (pmConfig *config);
-bool psastroMosaicRescaleChips (pmFPA *fpa);
-bool psastroMosaicOneChip (pmChip *chip, pmReadout *readout, psMetadata *recipe, psMetadata *updates, int iteration);
+bool 		  psastroMosaicGradients (pmFPA *fpa, psMetadata *recipe);
+bool 		  psastroMosaicCommonScale (pmFPA *fpa, psMetadata *recipe);
+bool 		  psastroMosaicAstrom (pmConfig *config);
+bool 		  psastroMosaicChipAstrom (pmFPA *fpa, psMetadata *recipe, int iteration);
+bool 		  psastroMosaicSetMatch (pmFPA *fpa, psMetadata *recipe, int iteration);
+bool 		  psastroMosaicSetAstrom (pmFPA *fpa);
+bool 		  psastroMosaicHeaders (pmConfig *config);
+bool 		  psastroMosaicRescaleChips (pmFPA *fpa);
+bool 		  psastroMosaicOneChip (pmChip *chip, pmReadout *readout, psMetadata *recipe, psMetadata *updates, int iteration);
 
 // Return version strings.
-psString psastroVersion(void);
-psString psastroVersionLong(void);
+psString 	  psastroVersion(void);
+psString 	  psastroVersionLong(void);
 
 // demo plots
-bool psastroPlotRawstars (psArray *rawstars, pmFPA *fpa, pmChip *chip);
-bool psastroPlotRefstars (psArray *refstars);
-bool psastroPlotOneChipFit (psArray *rawstars, psArray *refstars, psArray *match, pmAstromFitResults *results);
+bool 		  psastroPlotRawstars (psArray *rawstars, pmFPA *fpa, pmChip *chip);
+bool 		  psastroPlotRefstars (psArray *refstars);
+bool 		  psastroPlotOneChipFit (psArray *rawstars, psArray *refstars, psArray *match, pmAstromFitResults *results);
 
-bool psastroDumpRawstars (psArray *rawstars, pmFPA *fpa, pmChip *chip);
-bool psastroDumpRefstars (psArray *refstars, char *filename);
-bool psastroDumpMatches (pmFPA *fpa, char *filename);
-bool psastroDumpStars (psArray *stars, char *filename);
+bool 		  psastroDumpRawstars (psArray *rawstars, pmFPA *fpa, pmChip *chip);
+bool 		  psastroDumpRefstars (psArray *refstars, char *filename);
+bool 		  psastroDumpMatches (pmFPA *fpa, char *filename);
+bool 		  psastroDumpStars (psArray *stars, char *filename);
 
-bool psastroMosaicSetAstrom_tmp (pmFPA *fpa);
-int psastroSortByMag (const void **a, const void **b);
+bool		  psastroMosaicSetAstrom_tmp (pmFPA *fpa);
+int 		  psastroSortByMag (const void **a, const void **b);
+
+# endif /* PSASTRO_H */