Changeset 35449 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoadAstrometry.c

Timestamp:

Apr 27, 2013, 1:11:37 PM (13 years ago)

Author:

eugene

Message:

fix so we can warp from skycell to camera as well as vice versa

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoadAstrometry.c (modified) (3 diffs)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoadAstrometry.c

@@ -98 +98 @@
     }
     // for pswarpLocalFrame, I need transformations and HDUs on a single fpa (so set on astrom as well as target)
-    target->fpa->toTPA = psMemIncrRefCounter (astrom->fpa->toTPA);
-    target->fpa->fromTPA = psMemIncrRefCounter (astrom->fpa->fromTPA);
-    target->fpa->toSky = psMemIncrRefCounter (astrom->fpa->toSky);
+    // target->fpa->toTPA = psMemIncrRefCounter (astrom->fpa->toTPA);
+    // target->fpa->fromTPA = psMemIncrRefCounter (astrom->fpa->fromTPA);
+    // target->fpa->toSky = psMemIncrRefCounter (astrom->fpa->toSky);
 
     while ((chip = pmFPAviewNextChip (view, astrom->fpa, 1)) != NULL) {
@@ -126 +126 @@
         } else {
             // we use a default FPA pixel scale of 1.0
-            if (!pmAstromReadWCS(target->fpa, chip, hdu->header, 1.0)) {
+            if (!pmAstromReadWCS(astrom->fpa, chip, hdu->header, 1.0)) {
                 psError(psErrorCodeLast(), false, "Unable to read WCS astrometry for skycell.");
                 psFree(view);
@@ -136 +136 @@
     }
 
+    // for pswarpLocalFrame, I need transformations and HDUs on a single fpa (so set on astrom as well as target)
+    target->fpa->toTPA = psMemIncrRefCounter (astrom->fpa->toTPA);
+    target->fpa->fromTPA = psMemIncrRefCounter (astrom->fpa->fromTPA);
+    target->fpa->toSky = psMemIncrRefCounter (astrom->fpa->toSky);
+
     // reset the type to the original value
     astrom->type = saveType;