r26203 - in /branches/frame_order_cleanup: ./ specific_analyses/relax_disp/api.py -- October 08, 2014 - 08:40

Author: bugman
Date: Wed Oct  8 08:40:41 2014
New Revision: 26203

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

........
  r26197 | tlinnet | 2014-10-07 21:35:03 +0200 (Tue, 07 Oct 2014) | 6 lines
  
  Critical fix, for k_AB not belonging to list of global parameters.
  
  k_AB was only changed to the spin of interest, but not for the rest of the 
cluster.
  When the parameter vector is assembled,  
"assemble_param_vector(spins=spins)" it takes the global parameter from spin 
0.
  
  Bug #22754 (https://gna.org/bugs/index.php?22754): The minimise.calculate() 
does not calculate chi2 value for clustered residues.
........

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

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Oct  8 08:40:41 2014
@@ -1 +1 @@
-/trunk:1-26139,26142-26176,26188-26196
+/trunk:1-26139,26142-26176,26188-26197

Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/api.py?rev=26203&r1=26202&r2=26203&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/relax_disp/api.py    
(original)
+++ branches/frame_order_cleanup/specific_analyses/relax_disp/api.py    Wed 
Oct  8 08:40:41 2014
@@ -1192,7 +1192,7 @@
                     raise RelaxError("The parameter '%s' is not valid for 
this data pipe type." % param_i)
 
                 # If the parameter is a global parameter, then change for 
all spins part of the cluster.
-                if param_i in ['pA', 'kex', 'tex', 'kB', 'kC', 'kex_AB', 
'kex_BC', 'kex_AC']:
+                if param_i in ['pA', 'kex', 'k_AB', 'tex', 'kB', 'kC', 
'kex_AB', 'kex_BC', 'kex_AC']:
                     selection_list = spin_ids
                 else:
                     selection_list = [spin_id]