Changeset 35449 for branches/eam_branches/ipp-20130419

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

Location:

branches/eam_branches/ipp-20130419/pswarp

Files:

• doc/notes.20130406.txt (modified) (1 diff)
• src/pswarp.h (modified) (1 diff)
• src/pswarpLoadAstrometry.c (modified) (3 diffs)
• src/pswarpLoopSkycell.c (modified) (1 diff)
• src/pswarpParseCamera.c (modified) (1 diff)

branches/eam_branches/ipp-20130419/pswarp/doc/notes.20130406.txt

@@ -1 +1 @@
 
-examinging pswarp to handle inverse transformations or more general transformations:
+examining pswarp to handle inverse transformations or more general transformations:
 
 pswarp:

branches/eam_branches/ipp-20130419/pswarp/src/pswarp.h

@@ -94 +94 @@
 bool pswarpDefineBackground (pmConfig *config);
 bool pswarpLoop (pmConfig *config, psMetadata *stats);
+bool pswarpLoopSkycell (pmConfig *config, psMetadata *stats);
 bool pswarpLoopBackground (pmConfig *config, psMetadata *stats);
 psExit pswarpExitCode(psExit exitValue);

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;

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

@@ -18 +18 @@
 
 // Loop over the inputs, warp them to the output skycell and then write out the output.
-bool pswarpLoop(pmConfig *config, psMetadata *stats)
+bool pswarpLoopSkycell(pmConfig *config, psMetadata *stats)
 {
     bool status;

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

@@ -78 +78 @@
         }
     }
-    if ((astrom->type != PM_FPA_FILE_CMF) && (astrom->type != PM_FPA_FILE_WCS)) {
+    if (astrom && (astrom->type != PM_FPA_FILE_CMF) && (astrom->type != PM_FPA_FILE_WCS)) {
         psLogMsg("pswarp", PS_LOG_INFO, "%s is neither CMF nor WCS", "PSWARP.ASTROM");
     }