Changeset 41892 for trunk/psModules/src/astrom/pmAstrometryDistortion.c

Timestamp:

Nov 4, 2021, 6:05:18 PM (5 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-dev-20210817 (pmPattern updates, new inverse transform extra orders api, forward transform uses ORD, pmSourceIO_CMF.c.in conversion to pmFitsTableNew)

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/astrom/pmAstrometryDistortion.c (modified) (3 diffs)

trunk/psModules/src/astrom/pmAstrometryDistortion.c

@@ -29 +29 @@
 #include "pmAstrometryRegions.h"
 #include "pmAstrometryDistortion.h"
+#include "pmAstrometryUtils.h"
 #include "pmKapaPlots.h"
 
@@ -183 +184 @@
     PS_ASSERT_PTR_NON_NULL(fpa, false);
     PS_ASSERT_ARRAY_NON_NULL(gradients, false);
+
+    int ExtraOrders = pmAstrometryGetExtraOrders();
 
     psPolynomial2D *localX = NULL;
@@ -340 +343 @@
     psRegion *region = pmAstromFPAExtent (fpa);
 
-    // XXX psFree (fpa->fromTPA);
-    // XXX psPlaneTransform *myPT = psPlaneTransformAlloc(fpa->toTPA->x->nX+4, fpa->toTPA->x->nY+4);
-    // XXX fpa->fromTPA = psPlaneTransformInvert(myPT, fpa->toTPA, *region, 50);
-    // XXX psFree (myPT);
-
     // as of r40806, psPlaneTransformInvert supplies the extra order (if non-linear)
     psFree (fpa->fromTPA);
-    fpa->fromTPA = psPlaneTransformInvert(NULL, fpa->toTPA, *region, 100, 6);
+    fpa->fromTPA = psPlaneTransformInvert(NULL, fpa->toTPA, *region, 50, ExtraOrders);
     psFree (region);