Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psModules/src/camera/pmFPACopy.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/camera/pmFPACopy.c (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/psModules/src/camera/pmFPACopy.c

@@ -399 +399 @@
     if (targetHDU) {
         pmHDU *sourceHDU = pmHDUFromCell(source); // The source HDU
-        if (!sourceHDU) {
-            psWarning("Unable to copy header: no source header.");
-        } else if (sourceHDU->header) {
+        if (sourceHDU && sourceHDU->header) {
             targetHDU->header = psMetadataCopy(targetHDU->header, sourceHDU->header);
         }
@@ -481 +479 @@
     if (targetFPA && sourceFPA) {
         if (targetFPA->toSky) {
-            psAssert (targetFPA->toSky == sourceFPA->toSky, "chips within FPA have inconsistent astrometry references");
-        } else {
-            targetFPA->toSky = psMemIncrRefCounter (sourceFPA->toSky);
-        }
+            psFree(targetFPA->toSky);
+        }
+        targetFPA->toSky = psMemIncrRefCounter (sourceFPA->toSky);
         if (targetFPA->toTPA) {
-            psAssert (targetFPA->toTPA == sourceFPA->toTPA, "chips within FPA have inconsistent astrometry references");
-        } else {
-            targetFPA->toTPA = psMemIncrRefCounter (sourceFPA->toTPA);
-        }
+            psFree(targetFPA->toTPA);
+        }
+        targetFPA->toTPA = psMemIncrRefCounter (sourceFPA->toTPA);
         if (targetFPA->fromTPA) {
-            psAssert (targetFPA->fromTPA == sourceFPA->fromTPA, "chips within FPA have inconsistent astrometry references");
-        } else {
-            targetFPA->fromTPA = psMemIncrRefCounter (sourceFPA->fromTPA);
-        }
+            psFree(targetFPA->fromTPA);
+        }
+        targetFPA->fromTPA = psMemIncrRefCounter (sourceFPA->fromTPA);
     }