r24268 - in /branches/frame_order_cleanup: ./ target_functions/relax_disp.py -- June 24, 2014 - 11:08

Author: bugman
Date: Tue Jun 24 11:08:58 2014
New Revision: 24268

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

........
  r24138 | tlinnet | 2014-06-18 20:02:00 +0200 (Wed, 18 Jun 2014) | 3 lines
  
  Fixed the packing out of paramter tex for global analysis in model IT99.
  
  bug #22220(https://gna.org/bugs/index.php?22220): Unpacking of parameters 
for global analysis in model IT99, is performed wrong.
........

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

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 24 11:08:58 2014
@@ -1 +1 @@
-/trunk:1-24045,24047-24058
+/trunk:1-24045,24047-24058,24138

Modified: branches/frame_order_cleanup/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/target_functions/relax_disp.py?rev=24268&r1=24267&r2=24268&view=diff
==============================================================================
--- branches/frame_order_cleanup/target_functions/relax_disp.py (original)
+++ branches/frame_order_cleanup/target_functions/relax_disp.py Tue Jun 24 
11:08:58 2014
@@ -998,7 +998,7 @@
         R20 = params[:self.end_index[0]]
         dw = params[self.end_index[0]:self.end_index[1]]
         pA = params[self.end_index[1]]
-        tex = params[self.end_index[2]]
+        tex = params[self.end_index[1]+1]
 
         # Once off parameter conversions.
         pB = 1.0 - pA