r17966 - in /branches/frame_order_testing/maths_fns/frame_order: matrix_ops.py pseudo_ellipse.py -- November 14, 2012 - 11:54

Author: bugman
Date: Wed Nov 14 11:54:44 2012
New Revision: 17966

URL: http://svn.gna.org/viewcvs/relax?rev=17966&view=rev
Log:
Reverted r17957 and r17958 as these are no longer compatible with the 
previous reversion.

The command used was:
svn merge -r17958:r17956 .


Modified:
    branches/frame_order_testing/maths_fns/frame_order/matrix_ops.py
    branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse.py

Modified: branches/frame_order_testing/maths_fns/frame_order/matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order/matrix_ops.py?rev=17966&r1=17965&r2=17966&view=diff
==============================================================================
--- branches/frame_order_testing/maths_fns/frame_order/matrix_ops.py 
(original)
+++ branches/frame_order_testing/maths_fns/frame_order/matrix_ops.py Wed Nov 
14 11:54:44 2012
@@ -153,9 +153,15 @@
     return pcs
 
 
-def pcs_pivot_motion_full_qrint(full_in_ref_frame=None, r_pivot_atom=None, 
r_pivot_atom_rev=None, r_ln_pivot=None, A=None, R_eigen=None, RT_eigen=None, 
Ri_prime=None, pcs_theta=None, pcs_theta_err=None, missing_pcs=None, 
error_flag=False):
+def pcs_pivot_motion_full_qrint(theta_i=None, phi_i=None, sigma_i=None, 
full_in_ref_frame=None, r_pivot_atom=None, r_pivot_atom_rev=None, 
r_ln_pivot=None, A=None, R_eigen=None, RT_eigen=None, Ri_prime=None, 
pcs_theta=None, pcs_theta_err=None, missing_pcs=None, error_flag=False):
     """Calculate the PCS value after a pivoted motion for the isotropic cone 
model.
 
+    @keyword theta_i:           The half cone opening angle (polar angle).
+    @type theta_i:              float
+    @keyword phi_i:             The cone azimuthal angle.
+    @type phi_i:                float
+    @keyword sigma_i:           The torsion angle for state i.
+    @type sigma_i:              float
     @keyword full_in_ref_frame: An array of flags specifying if the tensor 
in the reference frame is the full or reduced tensor.
     @type full_in_ref_frame:    numpy rank-1 array
     @keyword r_pivot_atom:      The pivot point to atom vector.

Modified: branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse.py?rev=17966&r1=17965&r2=17966&view=diff
==============================================================================
--- branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse.py 
(original)
+++ branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse.py Wed 
Nov 14 11:54:44 2012
@@ -808,7 +808,7 @@
                 continue
 
             # Calculate the PCSs for this state.
-            
pcs_pivot_motion_full_qrint(full_in_ref_frame=self.full_in_ref_frame, 
r_pivot_atom=self.r_pivot_atom, r_pivot_atom_rev=self.r_pivot_atom_rev, 
r_ln_pivot=self.r_ln_pivot, A=self.A, R_eigen=self.R_eigen, 
RT_eigen=self.RT_eigen, Ri_prime=self.Ri_prime[i], pcs_theta=self.pcs_theta, 
pcs_theta_err=self.pcs_theta_err, missing_pcs=self.missing_pcs)
+            pcs_pivot_motion_full_qrint(theta_i=theta, phi_i=phi, 
sigma_i=sigma, full_in_ref_frame=self.full_in_ref_frame, 
r_pivot_atom=self.r_pivot_atom, r_pivot_atom_rev=self.r_pivot_atom_rev, 
r_ln_pivot=self.r_ln_pivot, A=self.A, R_eigen=self.R_eigen, 
RT_eigen=self.RT_eigen, Ri_prime=self.Ri_prime[i], pcs_theta=self.pcs_theta, 
pcs_theta_err=self.pcs_theta_err, missing_pcs=self.missing_pcs)
 
             # Increment the number of points.
             num += 1