Changeset 10613

Timestamp:

Dec 10, 2006, 8:37:37 AM (19 years ago)

Author:

eugene

Message:

changed p_psProject,p_psDeproject to psProject,psDeproject

Location:

trunk/psastro/src

Files:

• psastro.h (modified) (1 diff)
• psastroAstromGuess.c (modified) (3 diffs)
• psastroChipAstrom.c (modified) (1 diff)
• psastroChooseRefstars.c (modified) (1 diff)
• psastroMosaicAstrom.c (modified) (1 diff)
• psastroMosaicHeaders.c (modified) (1 diff)
• psastroMosaicSetAstrom.c (modified) (2 diffs)
• psastroUtils.c (modified) (1 diff)
• psastroWCS.c (modified) (2 diffs)

trunk/psastro/src/psastro.h

@@ -17 +17 @@
 # define RAD_DEG  0.017453292519943
 # define SIGN(X)  (((X) == 0) ? 0 : ((fabs((double)(X))) / (X)))
-
-# define fromTPA fromTangentPlane
-# define toTPA toTangentPlane
-# define toSky projection
 
 // this structure represents a fit to the logN / logS curve for a set of stars

trunk/psastro/src/psastroAstromGuess.c

@@ -58 +58 @@
         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 +83 @@
 
                     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 +97 @@
                         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);
                         

trunk/psastro/src/psastroChipAstrom.c

@@ -55 +55 @@
                     return false;
                 }
-                pmAstromWriteWCS (chip->toFPA, fpa->toTangentPlane, fpa->toSky, updates, plateScale);
+                pmAstromWriteWCS (chip->toFPA, fpa->toTPA, fpa->toSky, updates, plateScale);
                 psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSASTRO.HEADER",  PS_DATA_METADATA, "psastro header stats", updates);
                 psFree (updates);

trunk/psastro/src/psastroChooseRefstars.c

@@ -62 +62 @@
 
                     // XXX why is this still a private function?
-                    p_psProject (ref->TP, ref->sky, fpa->projection);
-                    psPlaneDistortApply (ref->FP, fpa->fromTangentPlane, ref->TP, 0.0, 0.0);
+                    psProject (ref->TP, ref->sky, fpa->toSky);
+                    psPlaneDistortApply (ref->FP, fpa->fromTPA, ref->TP, 0.0, 0.0);
                     psPlaneTransformApply (ref->chip, chip->fromFPA, ref->FP);
 

trunk/psastro/src/psastroMosaicAstrom.c

@@ -28 +28 @@
 
     // XXX no input distortion model yet; existing fpa distortion is identity: replace it
-    psFree (fpa->toTangentPlane);
-    psFree (fpa->fromTangentPlane);
-    fpa->toTangentPlane   = psPlaneDistortIdentity (order);
-    fpa->fromTangentPlane = psPlaneDistortIdentity (order);
+    psFree (fpa->toTPA);
+    psFree (fpa->fromTPA);
+    fpa->toTPA   = psPlaneDistortIdentity (order);
+    fpa->fromTPA = psPlaneDistortIdentity (order);
 
     grads = psastroMosaicGetGrads (fpa, recipe);

trunk/psastro/src/psastroMosaicHeaders.c

@@ -39 +39 @@
     }
 
-    psMetadata *mosaic = pmAstromWriteBilevelMosaic (fpa->projection, fpa->toTangentPlane, plateScale);
+    psMetadata *mosaic = pmAstromWriteBilevelMosaic (fpa->toSky, fpa->toTPA, plateScale);
 
     // XXX what is the EXTNAME??

trunk/psastro/src/psastroMosaicSetAstrom.c

@@ -30 +30 @@
         
                     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);
                 }
 
@@ -40 +40 @@
                     pmAstromObj *ref = refstars->data[i];
         
-                    p_psProject (ref->TP, ref->sky, fpa->projection);
-                    psPlaneDistortApply (ref->FP, fpa->fromTangentPlane, ref->TP, 0.0, 0.0);
+                    psProject (ref->TP, ref->sky, fpa->toSky);
+                    psPlaneDistortApply (ref->FP, fpa->fromTPA, ref->TP, 0.0, 0.0);
                     psPlaneTransformApply (ref->chip, chip->fromFPA, ref->FP);
                 }

trunk/psastro/src/psastroUtils.c

@@ -13 +13 @@
 
         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);
     }
 

trunk/psastro/src/psastroWCS.c

@@ -138 +138 @@
         if (fpa->toSky == NULL) {
             // XXX for now, use the identity for TPA <--> FPA
-            fpa->toTangentPlane = psPlaneDistortIdentity (1);
-            fpa->fromTangentPlane = psPlaneDistortIdentity (1);
+            fpa->toTPA = psPlaneDistortIdentity (1);
+            fpa->fromTPA = psPlaneDistortIdentity (1);
             fpa->toSky = toSky;
         } else {
-            if (fpa->toTangentPlane == NULL) psAbort ("wcs", "projection defined, tangent-plane not defined");
-            if (fpa->fromTangentPlane == NULL) psAbort ("wcs", "projection defined, tangent-plane not defined");
+            if (fpa->toTPA == NULL) psAbort ("wcs", "projection defined, tangent-plane not defined");
+            if (fpa->fromTPA == NULL) psAbort ("wcs", "projection defined, tangent-plane not defined");
 
             // adjust for common toSky for mosaic:
@@ -154 +154 @@
         
             psPlaneTransformApply (fp, toFPA, chip); // find the focal-plane coordinate of this chip's 0,0 coordinate
-            p_psDeproject (sky, fp, toSky); // find the RA,DEC coord of the focal-plane coordinate
-            p_psProject (fp, sky, fpa->toSky); // find the focal-plane coord of this RA,DEC coord using the ref chip projection
+            psDeproject (sky, fp, toSky); // find the RA,DEC coord of the focal-plane coordinate
+            psProject (fp, sky, fpa->toSky); // find the focal-plane coord of this RA,DEC coord using the ref chip projection
 
             toFPA->x->coeff[0][0] = fp->x;