r18438 - in /branches/frame_order_testing: ./ maths_fns/n_state_model.py -- February 07, 2013 - 16:50

Author: bugman
Date: Thu Feb  7 16:50:31 2013
New Revision: 18438

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

........
  r18437 | bugman | 2013-02-07 16:49:20 +0100 (Thu, 07 Feb 2013) | 3 lines
  
  Spacing fixes as identified by the Python 2to3 conversion program.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/maths_fns/n_state_model.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb  7 16:50:31 2013
@@ -1,1 +1,1 @@
-/trunk:1-18434
+/trunk:1-18437

Modified: branches/frame_order_testing/maths_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/n_state_model.py?rev=18438&r1=18437&r2=18438&view=diff
==============================================================================
--- branches/frame_order_testing/maths_fns/n_state_model.py (original)
+++ branches/frame_order_testing/maths_fns/n_state_model.py Thu Feb  7 
16:50:31 2013
@@ -958,9 +958,9 @@
             if not self.centre_fixed:
                 for j in range(self.num_spins):
                     if self.pcs_flag[align_index] and not 
self.missing_deltaij[align_index, j]:
-                        self.ddeltaij_theta[-3, align_index, j] = 
ave_pcs_tensor_ddeltaij_dc(ddj=self.dpcs_const_theta[align_index, j, :, 0], 
dj=self.pcs_const[align_index, j], r=self.paramag_dist[j], 
unit_vect=self.paramag_unit_vect[j], N=self.N, Ai=self.A[align_index], 
dr_dc=self.dr_theta[0], weights=self.probs)
-                        self.ddeltaij_theta[-2, align_index, j] = 
ave_pcs_tensor_ddeltaij_dc(ddj=self.dpcs_const_theta[align_index, j, :, 1], 
dj=self.pcs_const[align_index, j], r=self.paramag_dist[j], 
unit_vect=self.paramag_unit_vect[j], N=self.N, Ai=self.A[align_index], 
dr_dc=self.dr_theta[1], weights=self.probs)
-                        self.ddeltaij_theta[-1, align_index, j] = 
ave_pcs_tensor_ddeltaij_dc(ddj=self.dpcs_const_theta[align_index, j, :, 2], 
dj=self.pcs_const[align_index, j], r=self.paramag_dist[j], 
unit_vect=self.paramag_unit_vect[j], N=self.N, Ai=self.A[align_index], 
dr_dc=self.dr_theta[2], weights=self.probs)
+                        self.ddeltaij_theta[-3, align_index, j] = 
ave_pcs_tensor_ddeltaij_dc(ddj=self.dpcs_const_theta[align_index, j,:, 0], 
dj=self.pcs_const[align_index, j], r=self.paramag_dist[j], 
unit_vect=self.paramag_unit_vect[j], N=self.N, Ai=self.A[align_index], 
dr_dc=self.dr_theta[0], weights=self.probs)
+                        self.ddeltaij_theta[-2, align_index, j] = 
ave_pcs_tensor_ddeltaij_dc(ddj=self.dpcs_const_theta[align_index, j,:, 1], 
dj=self.pcs_const[align_index, j], r=self.paramag_dist[j], 
unit_vect=self.paramag_unit_vect[j], N=self.N, Ai=self.A[align_index], 
dr_dc=self.dr_theta[1], weights=self.probs)
+                        self.ddeltaij_theta[-1, align_index, j] = 
ave_pcs_tensor_ddeltaij_dc(ddj=self.dpcs_const_theta[align_index, j,:, 2], 
dj=self.pcs_const[align_index, j], r=self.paramag_dist[j], 
unit_vect=self.paramag_unit_vect[j], N=self.N, Ai=self.A[align_index], 
dr_dc=self.dr_theta[2], weights=self.probs)
 
             # Construct the chi-squared gradient element for parameter k, 
alignment i.
             for k in range(self.total_num_params):