r24139 - in /branches/disp_spin_speed: ./ target_functions/relax_disp.py -- June 18, 2014 - 20:03

Author: tlinnet
Date: Wed Jun 18 20:03:09 2014
New Revision: 24139

URL: http://svn.gna.org/viewcvs/relax?rev=24139&view=rev
Log:
Merged revisions 24138 via svnmerge from 
svn+ssh://tlinnet@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/disp_spin_speed/   (props changed)
    branches/disp_spin_speed/target_functions/relax_disp.py

Propchange: branches/disp_spin_speed/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 18 20:03:09 2014
@@ -1 +1 @@
-/trunk:1-24082
+/trunk:1-24138

Modified: branches/disp_spin_speed/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/target_functions/relax_disp.py?rev=24139&r1=24138&r2=24139&view=diff
==============================================================================
--- branches/disp_spin_speed/target_functions/relax_disp.py     (original)
+++ branches/disp_spin_speed/target_functions/relax_disp.py     Wed Jun 18 
20:03:09 2014
@@ -994,7 +994,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]
 
         # Convert dw from ppm to rad/s. Use the out argument, to pass 
directly to structure.
         multiply( multiply.outer( dw.reshape(1, self.NS), self.nm_no_nd_ones 
), self.frqs, out=self.dw_struct )