r17320 - in /branches/frame_order_testing/maths_fns: frame_order.py frame_order_matrix_ops.py -- July 27, 2012 - 09:48

Author: bugman
Date: Fri Jul 27 09:48:09 2012
New Revision: 17320

URL: http://svn.gna.org/viewcvs/relax?rev=17320&view=rev
Log:
Bug fix for the quasi-random numerical integration of PCSs in the 
pseudo-elliptic frame order model.

The back-calculated PCS values were being duplicated and constantly summed at 
each function call,
killing the target function.


Modified:
    branches/frame_order_testing/maths_fns/frame_order.py
    branches/frame_order_testing/maths_fns/frame_order_matrix_ops.py

Modified: branches/frame_order_testing/maths_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order.py?rev=17320&r1=17319&r2=17320&view=diff
==============================================================================
--- branches/frame_order_testing/maths_fns/frame_order.py (original)
+++ branches/frame_order_testing/maths_fns/frame_order.py Fri Jul 27 09:48:09 
2012
@@ -334,7 +334,7 @@
             # Set up the slave processors.
             self.slaves = []
             for i in range(self.processor.processor_size()):
-                
self.slaves.append(Slave_command_pcs_pseudo_ellipse_qrint(blocks[i], 
full_in_ref_frame=self.full_in_ref_frame, r_ln_pivot=self.r_ln_pivot, 
A=self.A_3D, Ri_prime=self.Ri_prime, pcs_theta=deepcopy(self.pcs_theta), 
pcs_theta_err=self.pcs_theta_err, missing_pcs=self.missing_pcs))
+                
self.slaves.append(Slave_command_pcs_pseudo_ellipse_qrint(blocks[i], 
full_in_ref_frame=self.full_in_ref_frame, r_ln_pivot=self.r_ln_pivot, 
A=self.A_3D, Ri_prime=self.Ri_prime, pcs_theta=self.pcs_theta, 
pcs_theta_err=self.pcs_theta_err, missing_pcs=self.missing_pcs))
 
         # The target function aliases (Scipy numerical integration).
         else:

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=17320&r1=17319&r2=17320&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 Fri Jul 
27 09:48:09 2012
@@ -2406,10 +2406,6 @@
         # Store the number of points in the data container.
         memo.data.num_pts += self.num_pts
 
-        # Sum the PCS values.
-        memo.data.pcs_theta += self.pcs_theta
-
-
 
 
 class Slave_command_pcs_pseudo_ellipse_qrint(Slave_command):