Changeset 35747 for branches/eam_branches/ipp-20130509/pswarp/src/pswarpLoadAstrometry.c

Timestamp:

Jul 3, 2013, 1:43:50 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

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

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

@@ -38 +38 @@
         psTrace ("pswarp", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
+        pmChip *targetChip = pmFPAviewThisChip(view, target->fpa); // < Chip in the output
+        if (!targetChip || !targetChip->process || !targetChip->file_exists) {
+            continue; // only load astrometry into output chips which exist!
+        }
         if (!pmFPAfileRead (astrom, view, config)) {
             psError(psErrorCodeLast(), false, "failed READ at CHIP %s", astrom->name);
@@ -109 +113 @@
         if (!chip->process || !chip->file_exists) { continue; }
 
+        pmChip *targetChip = pmFPAviewThisChip(view, target->fpa); // < Chip in the output
+        if (!targetChip || !targetChip->process || !targetChip->file_exists) {
+            continue; // only load astrometry into output chips which exist!
+        }
+
         // we've got the astrom header
         pmHDU *hdu = pmHDUFromChip(chip); ///< HDU for source
@@ -116 +125 @@
             return false;
         }
-
-        // 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) {