Changeset 41826 for branches/eam_branches/ipp-dev-20210817/psModules

Timestamp:

Oct 1, 2021, 9:50:01 AM (5 years ago)

Author:

eugene

Message:

add method to set the extra orders for inverse transformations

Location:

branches/eam_branches/ipp-dev-20210817/psModules/src/astrom

Files:

• pmAstrometryDistortion.c (modified) (3 diffs)
• pmAstrometryModel.c (modified) (6 diffs)
• pmAstrometryRegions.h (modified) (1 diff)
• pmAstrometryUtils.c (modified) (1 diff)
• pmAstrometryUtils.h (modified) (1 diff)
• pmAstrometryWCS.c (modified) (7 diffs)

branches/eam_branches/ipp-dev-20210817/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;
@@ -342 +345 @@
     // as of r40806, psPlaneTransformInvert supplies the extra order (if non-linear)
     psFree (fpa->fromTPA);
-    fpa->fromTPA = psPlaneTransformInvert(NULL, fpa->toTPA, *region, 50, EXTRA_ORDERS);
+    fpa->fromTPA = psPlaneTransformInvert(NULL, fpa->toTPA, *region, 50, ExtraOrders);
     psFree (region);
 

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

@@ -461 +461 @@
     bool status;
 
+    int ExtraOrders = pmAstrometryGetExtraOrders();
+
     // set FITS cursor
     if (!psFitsMoveExtName (file->fits, "CHIPS")) {
@@ -525 +527 @@
         // as of r40806, psPlaneTransformInvert supplies the extra order (if non-linear)
         psFree (chip->fromFPA);
-        chip->fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 50, EXTRA_ORDERS);
+        chip->fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 50, ExtraOrders);
 
         psFree (region);
@@ -539 +541 @@
 
     bool status;
+
+    int ExtraOrders = pmAstrometryGetExtraOrders();
 
     if (!psFitsMoveExtName (file->fits, "FP")) {
@@ -587 +591 @@
     // 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, EXTRA_ORDERS);
+    file->fpa->fromTPA = psPlaneTransformInvert(NULL, file->fpa->toTPA, *region, 50, ExtraOrders);
 
     psFree (model);
@@ -684 +688 @@
     bool status;
 
+    int ExtraOrders = pmAstrometryGetExtraOrders();
+
     // these externally supplied values are used to set the final transformation terms
     double RA  = psMetadataLookupF64 (&status, concepts, "FPA.RA"); REQUIRE (status, "missing FPA.RA");
@@ -731 +737 @@
 
     psFree (file->fpa->fromTPA);
-    file->fpa->fromTPA = psPlaneTransformInvert(NULL, file->fpa->toTPA, *region, 50, EXTRA_ORDERS);
+    file->fpa->fromTPA = psPlaneTransformInvert(NULL, file->fpa->toTPA, *region, 50, ExtraOrders);
 
     psFree (region);

branches/eam_branches/ipp-dev-20210817/psModules/src/astrom/pmAstrometryRegions.h

@@ -12 +12 @@
 
 // used by pmAstrometryDistortion.c, pmAstrometryWCS.c, pmAstrometryModel.c
-# define EXTRA_ORDERS 6
+// # define EXTRA_ORDERS 6
 
 /// @addtogroup Astrometry

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

@@ -23 +23 @@
 #include "pmAstrometryUtils.h"
 
+static int transform_extra_orders = 4;
+
+int pmAstrometryGetExtraOrders (void) {
+  return transform_extra_orders;
+}
+
+int pmAstrometrySetExtraOrders (int orders) {
+  transform_extra_orders = orders;
+  return transform_extra_orders;
+}
+
 // this is used by the test output block
 static int Nout = 0;

branches/eam_branches/ipp-dev-20210817/psModules/src/astrom/pmAstrometryUtils.h

@@ -25 +25 @@
 bool psPlaneDistortIsDiagonal (psPlaneDistort *distort);
 
+int pmAstrometryGetExtraOrders (void);
+int pmAstrometrySetExtraOrders (int orders);
+
 /// @}
 #endif

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

@@ -501 +501 @@
     psPlaneTransform *toFPA;
 
+    int ExtraOrders = pmAstrometryGetExtraOrders();
+
     // create transformation with 0,0 reference pixel and units of degrees/pixel
     toFPA = psPlaneTransformSetCenter (NULL, wcs->trans, -wcs->crpix1, -wcs->crpix2);
@@ -608 +610 @@
     // as of r40806, psPlaneTransformInvert supplies the extra order (if non-linear)
     psFree (chip->fromFPA);
-    chip->fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 50, EXTRA_ORDERS);
+    chip->fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 50, ExtraOrders);
     psFree (region);
 
@@ -648 +650 @@
      */
 
+    int ExtraOrders = pmAstrometryGetExtraOrders();
+
     psFree (chip->toFPA);
     if ((fabs(wcs->crpix1) > 0.01) || (fabs(wcs->crpix2) > 0.01)) {
@@ -668 +672 @@
     // as of r40806, psPlaneTransformInvert supplies the extra order (if non-linear)
     psFree (chip->fromFPA);
-    chip->fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 50, EXTRA_ORDERS);
+    chip->fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 50, ExtraOrders);
     psFree (region);
 
@@ -700 +704 @@
     // the region defines the FPA pixels covered by the tranformation
     psFree (fpa->fromTPA);
-    int additional_orders = EXTRA_ORDERS;  // This is the number of orders that should be added.
+    int additional_orders = pmAstrometryGetExtraOrders();  // This is the number of orders that should be added.
     bool status = false;
     int config_additional_orders = psMetadataLookupS32(&status,fpa->analysis, "ADDITIONAL_WCS_ORDERS");
@@ -997 +1001 @@
     PS_ASSERT_PTR_NON_NULL(inChip, NULL);
 
+    int ExtraOrders = pmAstrometryGetExtraOrders();
+
     if (outFPA == NULL) {
         outFPA = inFPA;
@@ -1032 +1038 @@
 
     // NOTE: the extraOrders value (4) should be ignored since outToFPA is specified to be linear
-    psPlaneTransform *outFromFPA = psPlaneTransformInvert(NULL, outToFPA, *outputBounds, 50, EXTRA_ORDERS);
+    psPlaneTransform *outFromFPA = psPlaneTransformInvert(NULL, outToFPA, *outputBounds, 50, ExtraOrders);
     if (!outFromFPA) {
         psFree(outToFPA);