Changeset 41536

Timestamp:

Apr 3, 2021, 2:26:18 PM (5 years ago)

Author:

eugene

Message:

pass in additional orders to psPlaneTransformInvert; some minor comments

Location:

trunk/psastro/src

Files:

• psastroFixChips.c (modified) (1 diff)
• psastroModelAdjust.c (modified) (3 diffs)
• psastroMosaicAstrom.c (modified) (1 diff)
• psastroMosaicCorrectDistortion.c (modified) (1 diff)
• psastroUtils.c (modified) (1 diff)

trunk/psastro/src/psastroFixChips.c

@@ -307 +307 @@
         obsChip->toFPA   = toFPA;
         // NOTE: when we call psPlaneTransformInvert here, we do not increase the order as in other places
-        obsChip->fromFPA = psPlaneTransformInvert(NULL, obsChip->toFPA, *region, 50);
+        // WHY NOT?
+        obsChip->fromFPA = psPlaneTransformInvert(NULL, obsChip->toFPA, *region, 50, 0);
         psFree (region);
 

trunk/psastro/src/psastroModelAdjust.c

@@ -124 +124 @@
         // invert the new fromFPA transform to get the new toFPA transform
         // NOTE: when we call psPlaneTransformInvert here, we do not increase the order as in other places
-        psPlaneTransform *fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 50);
+        psPlaneTransform *fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 50, 0);
         psFree (chip->fromFPA);
         chip->fromFPA = fromFPA;
@@ -146 +146 @@
     psFree (output->fpa->fromTPA);
     // NOTE: when we call psPlaneTransformInvert here, we do not increase the order as in other places
-    output->fpa->fromTPA = psPlaneTransformInvert(NULL, output->fpa->toTPA, *fpaRegion, 50);
+    output->fpa->fromTPA = psPlaneTransformInvert(NULL, output->fpa->toTPA, *fpaRegion, 50, 0);
 
     // the model now describes the unrotated focal-plane
@@ -195 +195 @@
         // the region used here is the region covered by the chip in the FPA
         // NOTE: when we call psPlaneTransformInvert here, we do not increase the order as in other places
-        psPlaneTransform *fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 50); 
+        psPlaneTransform *fromFPA = psPlaneTransformInvert(NULL, chip->toFPA, *region, 50, 0); 
         psFree (chip->fromFPA);
         chip->fromFPA = fromFPA;

trunk/psastro/src/psastroMosaicAstrom.c

@@ -296 +296 @@
     psRegion fitRegion = psRegionSet (xMin, xMax, yMin, yMax);
 
-    // psPlaneTransformInvert will generate a new fromTPA with order to match toTPA
+    // psPlaneTransformInvert will generate a new fromTPA (order increased vs toTPA)
     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);
+    fpa->fromTPA = psPlaneTransformInvert (NULL, fpa->toTPA, fitRegion, 100, 4);
 
     psFree (fpa->toSky);

trunk/psastro/src/psastroMosaicCorrectDistortion.c

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

trunk/psastro/src/psastroUtils.c

@@ -111 +111 @@
 
     psFree (chip->fromFPA);
-    chip->fromFPA = psPlaneTransformInvert (NULL, chip->toFPA, *region, 50);
+    chip->fromFPA = psPlaneTransformInvert (NULL, chip->toFPA, *region, 50, 4);
     psFree (region);