Changeset 39724

Timestamp:

Sep 25, 2016, 6:47:47 PM (10 years ago)

Author:

eugene

Message:

distortion map inverse needs to have higher order than forward transform

Location:

branches/czw_branch/20160809/psastro/src

Files:

• psastroMosaicAstrom.c (modified) (2 diffs)
• psastroMosaicCorrectDistortion.c (modified) (1 diff)

branches/czw_branch/20160809/psastro/src/psastroMosaicAstrom.c

@@ -280 +280 @@
 
     // psPlaneTransformInvert will generate a new fromTPA with order to match toTPA
-    fpa->fromTPA = psPlaneTransformInvert (fpa->fromTPA, fpa->toTPA, fitRegion, 100);
+    psFree (fpa->fromTPA);
+    psPlaneTransform *myPT = psPlaneTransformAlloc(fpa->toTPA->x->nX+4, fpa->toTPA->x->nY+4);
+
+    fpa->fromTPA = psPlaneTransformInvert (myPT, fpa->toTPA, fitRegion, 100);
+    psFree (myPT);
 
     psFree (fpa->toSky);
@@ -291 +295 @@
 
     psFree (view);
+
+    if (!psastroMosaicSetAstrom (fpa)) {
+        psError(PSASTRO_ERR_UNKNOWN, false, "failed to apply mosaic distortion terms\n");
+        return false;
+    }
+
     return true;
 }

branches/czw_branch/20160809/psastro/src/psastroMosaicCorrectDistortion.c

@@ -62 +62 @@
 
     psFree (fpa->fromTPA);
-    fpa->fromTPA = psPlaneTransformInvert(NULL, fpa->toTPA, *region, 50);
+    psPlaneTransform *myPT = psPlaneTransformAlloc(fpa->toTPA->x->nX+4, fpa->toTPA->x->nY+4);
+    fpa->fromTPA = psPlaneTransformInvert(myPT, fpa->toTPA, *region, 50);
+    psFree (myPT);
     psFree (region);