Index: trunk/psModules/src/astrom/pmAstrometryWCS.h
===================================================================
--- trunk/psModules/src/astrom/pmAstrometryWCS.h	(revision 10783)
+++ trunk/psModules/src/astrom/pmAstrometryWCS.h	(revision 10825)
@@ -7,6 +7,6 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-12-17 09:46:56 $
+*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-12-22 21:23:06 $
 *
 *  Copyright 2006 Institute for Astronomy, University of Hawaii
@@ -29,11 +29,4 @@
 pmAstromWCS;
 
-// read wcs terms from the supplied header into the fpa hierarchy components
-bool pmAstromReadWCS (pmFPA *fpa, pmChip *chip, const psMetadata *header, double plateScale, bool isMosaic);
-
-// write the wcs terms from the fpa hierarchy components into the supplied header
-// tol is the convergence tolerance for the non-linear solution to the reference pixel
-bool pmAstromWriteWCS (psMetadata *header, const pmFPA *fpa, const pmChip *chip, float tol);
-
 // support function for the pmAstromWCS representation
 pmAstromWCS *pmAstromWCSAlloc (int nXorder, int nYorder);
@@ -45,10 +38,28 @@
 pmAstromWCS *pmAstromWCSfromHeader (const psMetadata *header);
 
+// convert from wcs terms to chip->toFPA, fpa->toSky,toTPA terms
+bool pmAstromWCSBileveltoChip (pmChip *chip, const pmAstromWCS *wcs);
+bool pmAstromWCSBileveltoFPA (pmFPA *fpa, const pmAstromWCS *wcs);
+
+// convert from chip->toFPA, fpa->toSky,toTPA terms to wcs terms
+pmAstromWCS *pmAstromWCSBilevelChipFromFPA (const pmChip *chip, float tol);
+pmAstromWCS *pmAstromWCSBilevelMosaicFromFPA (const pmFPA *fpa, float tol);
+
 // convert the pmAstromWCS representation to the FPA representation
-bool pmAstromWCStoFPA (pmFPA *fpa, pmChip *chip, const pmAstromWCS *wcs, double plateScale, bool isMosaic);
+bool pmAstromWCStoFPA (pmFPA *fpa, pmChip *chip, const pmAstromWCS *wcs, double plateScale);
 pmAstromWCS *pmAstromWCSfromFPA (const pmFPA *fpa, const pmChip *chip, float tol);
 
-bool pmAstromWriteBilevelChip (psPlaneTransform *toFPA, psMetadata *header, double plateScale);
-psMetadata *pmAstromWriteBilevelMosaic (psProjection *toSky, psPlaneDistort *toTP, double plateScale);
+// read wcs terms from the supplied header into the fpa hierarchy components
+bool pmAstromReadWCS (pmFPA *fpa, pmChip *chip, const psMetadata *header, double plateScale);
+
+// write the wcs terms from the fpa hierarchy components into the supplied header
+// tol is the convergence tolerance for the non-linear solution to the reference pixel
+bool pmAstromWriteWCS (psMetadata *header, const pmFPA *fpa, const pmChip *chip, float tol);
+
+bool pmAstromReadBilevelChip (pmChip *chip, const psMetadata *header);
+bool pmAstromReadBilevelMosaic (pmFPA *fpa, const psMetadata *header);
+
+bool pmAstromWriteBilevelChip (psMetadata *header, const pmChip *chip, float tol);
+bool pmAstromWriteBilevelMosaic (psMetadata *header, const pmFPA *fpa, float tol);
 
 // move to pslib