r21090 - in /branches/relax_disp: ./ specific_analyses/api_common.py -- October 14, 2013 - 14:22

Author: bugman
Date: Mon Oct 14 14:22:42 2013
New Revision: 21090

URL: http://svn.gna.org/viewcvs/relax?rev=21090&view=rev
Log:
Merged revisions 21089 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r21089 | bugman | 2013-10-14 14:16:28 +0200 (Mon, 14 Oct 2013) | 6 lines
  
  Bug fix for the specific analysis API _data_init_spin() method.
  
  This is used for the API init_spin() method.  This is a latent bug which 
does not affect any of the
  current analyses in relax.  It was discovered in the relaxation dispersion 
branch.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/specific_analyses/api_common.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 14 14:22:42 2013
@@ -1,1 +1,1 @@
-/trunk:1-21053
+/trunk:1-21089

Modified: branches/relax_disp/specific_analyses/api_common.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/api_common.py?rev=21090&r1=21089&r2=21090&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/api_common.py (original)
+++ branches/relax_disp/specific_analyses/api_common.py Mon Oct 14 14:22:42 
2013
@@ -103,6 +103,10 @@
             if name not in data_cont.params:
                 continue
 
+            # The value already exists.
+            if hasattr(data_cont, name):
+                continue
+
             # The default value.
             param_type = self.PARAMS.get_type(name)
             if param_type == dict: