Changeset 41892 for trunk/psModules/src/astrom/pmAstrometryWCS.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/pmAstrometryWCS.c (modified) (14 diffs)

trunk/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);
@@ -552 +554 @@
         // apply the exiting fromTPA transformation to make the new toFPA consistent with the toTPA layter
         // XXX this only works if toTPA is at most a linear transformation
-        psPlaneTransform *toFPAnew = psPlaneTransformAlloc(toFPA->x->nX, toFPA->x->nY);
+        psPlaneTransform *toFPAnew = psPlaneTransformAlloc(toFPA->x->nX, toFPA->x->nY, PS_POLYNOMIAL_ORD);
         for (int i = 0; i <= toFPA->x->nX; i++) {
             for (int j = 0; j <= toFPA->x->nY; j++) {
@@ -608 +610 @@
     // as of r40806, psPlaneTransformInvert supplies the extra order (if non-linear)
     psFree (chip->fromFPA);
-    chip->fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 100, 6);
+    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)) {
       chip->toFPA = psPlaneTransformSetCenter (NULL, wcs->trans, -wcs->crpix1, -wcs->crpix2);
     } else {
-      chip->toFPA = psPlaneTransformAlloc(wcs->trans->x->nX, wcs->trans->x->nY);
+      chip->toFPA = psPlaneTransformAlloc(wcs->trans->x->nX, wcs->trans->x->nY, PS_POLYNOMIAL_ORD);
 
       // copy the toFPA x,y, transformations to the wcs version
@@ -668 +672 @@
     // as of r40806, psPlaneTransformInvert supplies the extra order (if non-linear)
     psFree (chip->fromFPA);
-    chip->fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 100, 6);
+    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 = 4;  // 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");
@@ -706 +710 @@
       additional_orders = config_additional_orders; 
     }
-    fpa->fromTPA = psPlaneTransformInvert(NULL, fpa->toTPA, region, 100, additional_orders);
+    fpa->fromTPA = psPlaneTransformInvert(NULL, fpa->toTPA, region, 50, additional_orders);
     return true;
 }
@@ -739 +743 @@
     // XXX require fpa->toTPA->nX == 1
 
-    psPlaneTransform *toTPA = psPlaneTransformAlloc(chip->toFPA->x->nX, chip->toFPA->x->nY);
+    psPlaneTransform *toTPA = psPlaneTransformAlloc(chip->toFPA->x->nX, chip->toFPA->x->nY, PS_POLYNOMIAL_ORD);
 
     for (int i = 0; i <= toTPA->x->nX; i++) {
@@ -958 +962 @@
     }
 
-    psPlaneTransform *newTrans = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *newTrans = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
 
     if (!psPlaneTransformFit(newTrans, src, dst, 0, 0)) {
@@ -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, 100, 6);
+    psPlaneTransform *outFromFPA = psPlaneTransformInvert(NULL, outToFPA, *outputBounds, 50, ExtraOrders);
     if (!outFromFPA) {
         psFree(outToFPA);
@@ -1116 +1122 @@
     }
 
-    psPlaneTransform *newToFPA = psPlaneTransformAlloc(1, 1);
+    psPlaneTransform *newToFPA = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     newToFPA->x->coeffMask[1][1] = 1;
     newToFPA->y->coeffMask[1][1] = 1;
@@ -1148 +1154 @@
     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) {
@@ -1187 +1193 @@
     psMemSetDeallocator(wcs, (psFreeFunc) pmAstromWCSFree);
 
-    wcs->trans = psPlaneTransformAlloc (nXorder, nYorder);
+    // note: WCS transforms are always defined as chip to sky
+    wcs->trans = psPlaneTransformAlloc (nXorder, nYorder, PS_POLYNOMIAL_ORD);
     wcs->toSky = NULL;
     wcs->wcsCDkeys = 0;