r17841 - in /branches/frame_order_testing: ./ maths_fns/frame_order/__init__.py -- October 16, 2012 - 10:58

Author: bugman
Date: Tue Oct 16 10:58:09 2012
New Revision: 17841

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

........
  r17676 | bugman | 2012-10-02 16:30:46 +0200 (Tue, 02 Oct 2012) | 3 lines
  
  Python 3 bug fix for the frame order analysis - another int division 
problem.
........

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

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct 16 10:58:09 2012
@@ -1,1 +1,1 @@
-/trunk:1-17274,17295-17359,17361-17365,17367-17376,17378-17389,17391-17538,17540,17542,17552-17675
+/trunk:1-17274,17295-17359,17361-17365,17367-17376,17378-17389,17391-17538,17540,17542,17552-17676

Modified: branches/frame_order_testing/maths_fns/frame_order/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order/__init__.py?rev=17841&r1=17840&r2=17841&view=diff
==============================================================================
--- branches/frame_order_testing/maths_fns/frame_order/__init__.py (original)
+++ branches/frame_order_testing/maths_fns/frame_order/__init__.py Tue Oct 16 
10:58:09 2012
@@ -382,7 +382,7 @@
             raise RelaxError("The full_in_ref_frame argument " + 
repr(self.full_in_ref_frame) + " must be supplied.")
 
         # Tensor set up.
-        self.num_tensors = len(self.full_tensors) / 5
+        self.num_tensors = int(len(self.full_tensors) / 5)
         self.A_3D = zeros((self.num_tensors, 3, 3), float64)
         self.A_3D_bc = zeros((self.num_tensors, 3, 3), float64)
         self.A_5D_bc = zeros(self.num_tensors*5, float64)