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

Timestamp:

Apr 26, 2013, 9:07:23 AM (13 years ago)

Author:

eugene

Message:

major mods to allow multichip output

File:

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

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

@@ -14 +14 @@
 // WCS and read the headers.  We place the resulting info on the target astrometry
 // containers
-bool pswarpLoadAstrometry (pmConfig *config, pmFPAfile *astrom, pmFPAfile *target) {
+bool pswarpLoadAstrometry (pmFPAfile *target, pmFPAfile *astrom, pmConfig *config) {
 
     pmChip *chip = NULL;
     pmCell *cell = NULL;
+
+    // XXX assert that astrom be WCS or CMF?
 
     // XXX set the type to be WCS
@@ -42 +44 @@
         while ((cell = pmFPAviewNextCell (view, astrom->fpa, 1)) != NULL) {
             psTrace ("pswarp", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
-            if (!cell->process || !cell->file_exists) { continue; }
+            if (!cell->process) { continue; }
             if (!pmFPAfileRead (astrom, view, config)) {
                 psError(psErrorCodeLast(), false, "failed READ at CELL %s", astrom->name);
@@ -89 +91 @@
     // apply the bilevel astrometry elements to the target
     if (bilevelAstrometry) {
-        if (!pmAstromReadBilevelMosaic(target->fpa, phu->header)) {
+        if (!pmAstromReadBilevelMosaic(astrom->fpa, phu->header)) {
             psError(psErrorCodeLast(), false, "Unable to read bilevel mosaic astrometry for skycell.");
             psFree(view);
@@ -95 +97 @@
         }
     }
+    // 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);
 
     while ((chip = pmFPAviewNextChip (view, astrom->fpa, 1)) != NULL) {
@@ -110 +116 @@
         // We read from the astrometry source into the target.
         pmChip *targetChip = pmFPAviewThisChip(view, target->fpa); ///< Chip in the output
+        if (!targetChip) continue; // only load astrometry into output chips which exist!
+
         if (bilevelAstrometry) {
-            if (!pmAstromReadBilevelChip(targetChip, hdu->header)) {
+            if (!pmAstromReadBilevelChip(chip, hdu->header)) {
                 psError(psErrorCodeLast(), false, "Unable to read bilevel chip astrometry for skycell.");
                 psFree(view);
@@ -118 +126 @@
         } else {
             // we use a default FPA pixel scale of 1.0
-            if (!pmAstromReadWCS(target->fpa, targetChip, hdu->header, 1.0)) {
+            if (!pmAstromReadWCS(target->fpa, chip, hdu->header, 1.0)) {
                 psError(psErrorCodeLast(), false, "Unable to read WCS astrometry for skycell.");
                 psFree(view);
@@ -124 +132 @@
             }
         }
+        targetChip->toFPA = psMemIncrRefCounter (chip->toFPA);
+        targetChip->fromFPA = psMemIncrRefCounter (chip->fromFPA);
     }