Changeset 41833

Timestamp:

Oct 11, 2021, 11:36:17 AM (5 years ago)

Author:

eugene

Message:

explicitly use Ordinary polynomials for forward astrometry transformations (chip->fpa->tpa->sky)

Location:

branches/eam_branches/ipp-dev-20210817/psastro/src

Files:

• psastroAstromGuess.c (modified) (1 diff)
• psastroFixChips.c (modified) (2 diffs)
• psastroMosaicAstrom.c (modified) (1 diff)
• psastroMosaicCorrectDistortion.c (modified) (1 diff)
• psastroMosaicFPtoTP.c (modified) (1 diff)
• psastroMosaicGradients.c (modified) (1 diff)
• psastroMosaicOneChip.c (modified) (1 diff)
• psastroOneChipFit.c (modified) (1 diff)
• psastroUtils.c (modified) (1 diff)

branches/eam_branches/ipp-dev-20210817/psastro/src/psastroAstromGuess.c

@@ -397 +397 @@
     }
 
-    psPlaneTransform *map = psPlaneTransformAlloc (1, 1);
+    psPlaneTransform *map = psPlaneTransformAlloc (1, 1, PS_POLYNOMIAL_ORD);
     map->x->coeffMask[1][1] = PS_POLY_MASK_SET;
     map->y->coeffMask[1][1] = PS_POLY_MASK_SET;

branches/eam_branches/ipp-dev-20210817/psastro/src/psastroFixChips.c

@@ -170 +170 @@
     if (DEBUG) fclose (f);
 
-    psPlaneTransform *map = psPlaneTransformAlloc (1, 1);
+    psPlaneTransform *map = psPlaneTransformAlloc (1, 1, PS_POLYNOMIAL_ORD);
 
     psVector *mask = psVectorAlloc (nPts, PS_TYPE_VECTOR_MASK);
@@ -289 +289 @@
         // 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 *toFPA = psPlaneTransformAlloc(refChip->toFPA->x->nX, refChip->toFPA->x->nY);
+        psPlaneTransform *toFPA = psPlaneTransformAlloc(refChip->toFPA->x->nX, refChip->toFPA->x->nY, PS_POLYNOMIAL_ORD);
         for (int i = 0; i <= refChip->toFPA->x->nX; i++) {
             for (int j = 0; j <= refChip->toFPA->x->nY; j++) {

branches/eam_branches/ipp-dev-20210817/psastro/src/psastroMosaicAstrom.c

@@ -277 +277 @@
     }
 
-    // the original transforms are (1, 1), but we will need higher order to fit the distortions
+    // the original transforms are (1, 1), but we will need higher order to fit the distortions.
+    // forward transformations (chip->fpa->tpa->sky) use Ordinary polynomials
     psFree (fpa->toTPA);
-
-    // the original transforms are (1, 1), but we will need higher order to fit the distortions
-    fpa->toTPA = psPlaneTransformAlloc (order, order);
+    fpa->toTPA = psPlaneTransformAlloc (order, order, PS_POLYNOMIAL_ORD);
     for (int i = 0; i <= fpa->toTPA->x->nX; i++) {
         for (int j = 0; j <= fpa->toTPA->x->nY; j++) {

branches/eam_branches/ipp-dev-20210817/psastro/src/psastroMosaicCorrectDistortion.c

@@ -22 +22 @@
     }
 
-    // store the new coeffs in a new structure
-    psPlaneTransform *toTPAnew = psPlaneTransformAlloc(fpa->toTPA->x->nX, fpa->toTPA->x->nY);
+    // Store the new coeffs in a new structure.  Forward transformations (chip->fpa->tpa->sky)
+    // use Ordinary polynomials
+    psPlaneTransform *toTPAnew = psPlaneTransformAlloc(fpa->toTPA->x->nX, fpa->toTPA->x->nY, PS_POLYNOMIAL_ORD);
 
     // set the new coeffs, or set the mask

branches/eam_branches/ipp-dev-20210817/psastro/src/psastroMosaicFPtoTP.c

@@ -80 +80 @@
 
     // linear fit without xy cross term
-    psPlaneTransform *map = psPlaneTransformAlloc (1, 1);
+    psPlaneTransform *map = psPlaneTransformAlloc (1, 1, PS_POLYNOMIAL_ORD);
     map->x->coeffMask[1][1] = PS_POLY_MASK_SET;
     map->y->coeffMask[1][1] = PS_POLY_MASK_SET;

branches/eam_branches/ipp-dev-20210817/psastro/src/psastroMosaicGradients.c

@@ -84 +84 @@
         return false;
     }
+
+    // forward transformations (chip->fpa->tpa->sky) use Ordinary polynomials
     psFree (fpa->toTPA);
-    fpa->toTPA = psPlaneTransformAlloc (order, order);
+    fpa->toTPA = psPlaneTransformAlloc (order, order, PS_POLYNOMIAL_ORD);
     for (int i = 0; i <= fpa->toTPA->x->nX; i++) {
         for (int j = 0; j <= fpa->toTPA->x->nY; j++) {

branches/eam_branches/ipp-dev-20210817/psastro/src/psastroMosaicOneChip.c

@@ -88 +88 @@
         }
     } else {
+        // Forward transformations (chip->fpa->tpa->sky) use Ordinary polynomials
         psFree (chip->toFPA);
-        chip->toFPA = psPlaneTransformAlloc (order, order);
+        chip->toFPA = psPlaneTransformAlloc (order, order, PS_POLYNOMIAL_ORD);
         for (int i = 0; i <= chip->toFPA->x->nX; i++) {
             for (int j = 0; j <= chip->toFPA->x->nY; j++) {

branches/eam_branches/ipp-dev-20210817/psastro/src/psastroOneChipFit.c

@@ -121 +121 @@
         }
 
-        // create output toFPA; set masks appropriate to the Elixir DVO astrometry format
+        // Create output toFPA; set masks appropriate to the Elixir DVO astrometry format.
+        // Forward transformations (chip->fpa->tpa->sky) use Ordinary polynomials
         psFree (chip->toFPA);
-        chip->toFPA = psPlaneTransformAlloc (order, order);
+        chip->toFPA = psPlaneTransformAlloc (order, order, PS_POLYNOMIAL_ORD);
         for (int i = 0; i <= chip->toFPA->x->nX; i++) {
             for (int j = 0; j <= chip->toFPA->x->nY; j++) {

branches/eam_branches/ipp-dev-20210817/psastro/src/psastroUtils.c

@@ -215 +215 @@
 psPlaneTransform *psPlaneTransformCopy (psPlaneTransform *input) {
 
-    psPlaneTransform *output = psPlaneTransformAlloc (input->x->nX, input->x->nY);
+    psPlaneTransform *output = psPlaneTransformAlloc (input->x->nX, input->x->nY, input->x->type);
 
     for (int i = 0; i < input->x->nX; i++) {