Index: trunk/psastro/src/psastroAstromGuess.c
===================================================================
--- trunk/psastro/src/psastroAstromGuess.c	(revision 10438)
+++ trunk/psastro/src/psastroAstromGuess.c	(revision 10613)
@@ -58,10 +58,10 @@
         if (newFPA) {
             newFPA = false;
-	    while (fpa->projection->R <        0) fpa->projection->R += 2.0*M_PI;
-	    while (fpa->projection->R > 2.0*M_PI) fpa->projection->R -= 2.0*M_PI;
-            RAminSky = fpa->projection->R - M_PI;
-            RAmaxSky = fpa->projection->R + M_PI;
-            RAmin = RAmax = fpa->projection->R;
-            DECmin = DECmax = fpa->projection->D;
+	    while (fpa->toSky->R <        0) fpa->toSky->R += 2.0*M_PI;
+	    while (fpa->toSky->R > 2.0*M_PI) fpa->toSky->R -= 2.0*M_PI;
+            RAminSky = fpa->toSky->R - M_PI;
+            RAmaxSky = fpa->toSky->R + M_PI;
+            RAmin = RAmax = fpa->toSky->R;
+            DECmin = DECmax = fpa->toSky->D;
         }
 
@@ -83,6 +83,6 @@
 
                     psPlaneTransformApply (raw->FP, chip->toFPA, raw->chip);
-                    psPlaneDistortApply (raw->TP, fpa->toTangentPlane, raw->FP, 0.0, 0.0);
-                    p_psDeproject (raw->sky, raw->TP, fpa->projection);
+                    psPlaneDistortApply (raw->TP, fpa->toTPA, raw->FP, 0.0, 0.0);
+                    psDeproject (raw->sky, raw->TP, fpa->toSky);
 
 		    if (i < 10) {
@@ -97,6 +97,6 @@
                         psPlane *ch = psPlaneAlloc();
 			
-                        p_psProject (tp, raw->sky, fpa->projection);
-                        psPlaneDistortApply (fp, fpa->fromTangentPlane, tp, 0.0, 0.0);
+                        psProject (tp, raw->sky, fpa->toSky);
+                        psPlaneDistortApply (fp, fpa->fromTPA, tp, 0.0, 0.0);
                         psPlaneTransformApply (ch, chip->fromFPA, fp);