Changeset 23761 for trunk/psModules/src/camera/pmFPACopy.c

Timestamp:

Apr 8, 2009, 4:59:57 PM (17 years ago)

Author:

Paul Price

Message:

Don't assert that the astrometry is the same --- ensure that it is.
This is required for the case of copying over something that has already been generated.

File:

• trunk/psModules/src/camera/pmFPACopy.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPACopy.c

@@ -479 +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);
     }