Changeset 41823 for branches/eam_branches/ipp-dev-20210817/psModules/src/astrom/pmAstrometryWCS.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/pmAstrometryWCS.c (modified) (5 diffs)

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

@@ -608 +608 @@
     // 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);
 
@@ -668 +668 @@
     // 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);
 
@@ -700 +700 @@
     // the region defines the FPA pixels covered by the tranformation
     psFree (fpa->fromTPA);
-    int additional_orders = 4;  // This is the number of orders that should be added.
+    int additional_orders = EXTRA_ORDERS;  // This is the number of orders that should be added.
     bool status = false;
     int config_additional_orders = psMetadataLookupS32(&status,fpa->analysis, "ADDITIONAL_WCS_ORDERS");
@@ -1032 +1032 @@
 
     // NOTE: the extraOrders value (4) should be ignored since outToFPA is specified to be linear
-    psPlaneTransform *outFromFPA = psPlaneTransformInvert(NULL, outToFPA, *outputBounds, 50, 4);
+    psPlaneTransform *outFromFPA = psPlaneTransformInvert(NULL, outToFPA, *outputBounds, 50, EXTRA_ORDERS);
     if (!outFromFPA) {
         psFree(outToFPA);
@@ -1148 +1148 @@
     psFree(dst);
 
-    // this is a linear transformation
+    // this is a linear transformation, no extra orders are needed
     psPlaneTransform *newFromFPA = psPlaneTransformInvert(NULL, newToFPA, *bounds, 1, 0);
     if (!newFromFPA) {