Author: bugman Date: Wed Jul 15 17:46:36 2009 New Revision: 9239 URL: http://svn.gna.org/viewcvs/relax?rev=9239&view=rev Log: Removed the checks to see if the RDC or PCS data is already loaded. Now data can be loaded sequentially by a few calls to rdc.read() and pcs.read(). Modified: 1.3/generic_fns/pcs.py 1.3/generic_fns/rdc.py Modified: 1.3/generic_fns/pcs.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pcs.py?rev=9239&r1=9238&r2=9239&view=diff ============================================================================== --- 1.3/generic_fns/pcs.py (original) +++ 1.3/generic_fns/pcs.py Wed Jul 15 17:46:36 2009 @@ -481,10 +481,6 @@ # Alias the current data pipe. cdp = pipes.get_pipe() - # Test if PCS data corresponding to 'id' already exists. - if data_col != None and hasattr(cdp, 'pcs_ids') and id in cdp.pcs_ids: - raise RelaxPCSError, id - # Either the data or error column must be supplied. if data_col == None and error_col == None: raise RelaxError, "One of either the data or error column must be supplied." Modified: 1.3/generic_fns/rdc.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/rdc.py?rev=9239&r1=9238&r2=9239&view=diff ============================================================================== --- 1.3/generic_fns/rdc.py (original) +++ 1.3/generic_fns/rdc.py Wed Jul 15 17:46:36 2009 @@ -405,10 +405,6 @@ # Alias the current data pipe. cdp = pipes.get_pipe() - # Test if RDC data corresponding to 'id' already exists. - if data_col != None and hasattr(cdp, 'rdc_ids') and id in cdp.rdc_ids: - raise RelaxRDCError, id - # Either the data or error column must be supplied. if data_col == None and error_col == None: raise RelaxError, "One of either the data or error column must be supplied."