r17980 - in /trunk/generic_fns: pcs.py rdc.py -- November 15, 2012 - 09:17

Author: bugman
Date: Thu Nov 15 09:17:20 2012
New Revision: 17980

URL: http://svn.gna.org/viewcvs/relax?rev=17980&view=rev
Log:
The rdc.copy and pcs.copy user functions now support overwriting pre-existing 
data.


Modified:
    trunk/generic_fns/pcs.py
    trunk/generic_fns/rdc.py

Modified: trunk/generic_fns/pcs.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/pcs.py?rev=17980&r1=17979&r2=17980&view=diff
==============================================================================
--- trunk/generic_fns/pcs.py (original)
+++ trunk/generic_fns/pcs.py Thu Nov 15 09:17:20 2012
@@ -261,14 +261,10 @@
 
     # Loop over the align IDs.
     for align_id in align_ids:
-        # Test if PCS ID string exists for pipe_to.
-        if align_id in dp_to.pcs_ids:
-            raise RelaxPCSError(align_id)
-
         # Copy the global data.
-        if align_id not in dp_to.align_ids:
+        if align_id not in dp_to.align_ids and align_id not in 
dp_to.align_ids:
             dp_to.align_ids.append(align_id)
-        if align_id in dp_from.pcs_ids:
+        if align_id in dp_from.pcs_ids and align_id not in dp_to.pcs_ids:
             dp_to.pcs_ids.append(align_id)
 
         # Spin loop.

Modified: trunk/generic_fns/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/rdc.py?rev=17980&r1=17979&r2=17980&view=diff
==============================================================================
--- trunk/generic_fns/rdc.py (original)
+++ trunk/generic_fns/rdc.py Thu Nov 15 09:17:20 2012
@@ -210,14 +210,10 @@
 
     # Loop over the align IDs.
     for align_id in align_ids:
-        # Test if RDC ID string exists for pipe_to.
-        if align_id in dp_to.rdc_ids:
-            raise RelaxRDCError(align_id)
-
         # Copy the global data.
-        if align_id not in dp_to.align_ids:
+        if align_id not in dp_to.align_ids and align_id not in 
dp_to.align_ids:
             dp_to.align_ids.append(align_id)
-        if align_id in dp_from.rdc_ids:
+        if align_id in dp_from.rdc_ids and align_id not in dp_to.rdc_ids:
             dp_to.rdc_ids.append(align_id)
 
         # Spin loop.