Changeset 41823 for branches/eam_branches/ipp-dev-20210817/psModules/src/astrom/pmAstrometryModel.c

Timestamp:

Sep 29, 2021, 9:54:17 AM (5 years ago)

Author:

eugene

Message:

replace 4 with EXTRA_ORDERS macro

File:

• branches/eam_branches/ipp-dev-20210817/psModules/src/astrom/pmAstrometryModel.c (modified) (4 diffs)

branches/eam_branches/ipp-dev-20210817/psModules/src/astrom/pmAstrometryModel.c

@@ -525 +525 @@
         // as of r40806, psPlaneTransformInvert supplies the extra order (if non-linear)
         psFree (chip->fromFPA);
-        chip->fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 50, 4);
+        chip->fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 50, EXTRA_ORDERS);
 
         psFree (region);
@@ -585 +585 @@
     psRegion *region = pmAstromFPAExtent (file->fpa);
 
-    // XXX psFree (file->fpa->fromTPA);
-    // XXX psPlaneTransform *myPT = psPlaneTransformAlloc(file->fpa->toTPA->x->nX+4, file->fpa->toTPA->x->nY+4);
-    // XXX file->fpa->fromTPA = psPlaneTransformInvert(myPT, file->fpa->toTPA, *region, 50);
-    // XXX psFree (myPT);
-
     // as of r40806, psPlaneTransformInvert supplies the extra order (if non-linear)
     psFree (file->fpa->fromTPA);
-    file->fpa->fromTPA = psPlaneTransformInvert(NULL, file->fpa->toTPA, *region, 50, 4);
+    file->fpa->fromTPA = psPlaneTransformInvert(NULL, file->fpa->toTPA, *region, 50, EXTRA_ORDERS);
 
     psFree (model);
@@ -728 +723 @@
     psLogMsg ("psModules.astrom", 4, "Position Angle: %f, Model Position Angle Zero Point: %f\n", POS, PosZero);
 
-//    psPlaneTransform *fromTPA = psPlaneTransformRotate (NULL, file->fpa->fromTPA, rotatorParity * (PosZero - POS));
-//    psFree (file->fpa->fromTPA);
-//    file->fpa->fromTPA = fromTPA;
-
     psPlaneTransform *toTPA = psPlaneTransformRotate (NULL, file->fpa->toTPA, rotatorParity * (POS - PosZero));
     psFree (file->fpa->toTPA);
@@ -739 +730 @@
     psRegion *region = pmAstromFPAExtent (file->fpa);
 
-    // XXX psFree (file->fpa->fromTPA);
-    // XXX psPlaneTransform *myPT = psPlaneTransformAlloc(file->fpa->toTPA->x->nX+4, file->fpa->toTPA->x->nY+4);
-    // XXX file->fpa->fromTPA = psPlaneTransformInvert(myPT, file->fpa->toTPA, *region, 50);
-    // XXX psFree (myPT);
-
     psFree (file->fpa->fromTPA);
-    file->fpa->fromTPA = psPlaneTransformInvert(NULL, file->fpa->toTPA, *region, 50, 4);
+    file->fpa->fromTPA = psPlaneTransformInvert(NULL, file->fpa->toTPA, *region, 50, EXTRA_ORDERS);
 
     psFree (region);