Changeset 23197 for branches/cnb_branches/cnb_branch_20090215/psModules/src/camera/pmFPACopy.c

Timestamp:

Mar 5, 2009, 11:13:29 AM (17 years ago)

Author:

beaumont

Message:

Finished ppStack visualization. Unified the way in which visualizations are invoked, plotting windows are closed, etc

Location:

branches/cnb_branches/cnb_branch_20090215

Files:

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

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

@@ -13 +13 @@
 #include "pmFPAUtils.h"
 #include "pmHDUUtils.h"
+#include "pmConceptsCopy.h"
 #include "pmFPACopy.h"
 
@@ -452 +453 @@
     // Update the concepts
     psMetadataItem *chipName = psMemIncrRefCounter(psMetadataLookup(target->concepts, "CHIP.NAME"));
-    psMetadataCopy(target->concepts, source->concepts);
+    pmConceptsCopyChip(target, source, false);
     psMetadataAddItem(target->concepts, chipName, PS_LIST_TAIL, PS_META_REPLACE);
     psFree(chipName);
-    psMetadataCopy(target->parent->concepts, source->parent->concepts);
+    pmConceptsCopyFPA(target->parent, source->parent, false, false);
 
     // Update the astrometric parameters
@@ -467 +468 @@
 
     if (targetFPA && sourceFPA) {
-        if (targetFPA->toSky) {
-            psAssert (targetFPA->toSky == sourceFPA->toSky, "chips within FPA have inconsistent astrometry references");
-        } else {
-            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);
-        }
-        if (targetFPA->fromTPA) {
-            psAssert (targetFPA->fromTPA == sourceFPA->fromTPA, "chips within FPA have inconsistent astrometry references");
-        } else {
-            targetFPA->fromTPA = psMemIncrRefCounter (sourceFPA->fromTPA);
-        }
+        if (targetFPA->toSky) {
+            psAssert (targetFPA->toSky == sourceFPA->toSky, "chips within FPA have inconsistent astrometry references");
+        } else {
+            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);
+        }
+        if (targetFPA->fromTPA) {
+            psAssert (targetFPA->fromTPA == sourceFPA->fromTPA, "chips within FPA have inconsistent astrometry references");
+        } else {
+            targetFPA->fromTPA = psMemIncrRefCounter (sourceFPA->fromTPA);
+        }
     }
 
@@ -525 +526 @@
 
     // Update the concepts
-    psMetadataCopy(targetChip->concepts, sourceChip->concepts);
+    pmConceptsCopyChip(targetChip, sourceChip, false);
 
     // update the attributes
@@ -572 +573 @@
 
     // Update the concepts
-    psMetadataCopy(target->concepts, source->concepts);
+    pmConceptsCopyFPA(target, source, false, false);
 
     return status;