r17860 - in /branches/frame_order_testing: ./ generic_fns/structure/geometric.py -- October 16, 2012 - 14:18

Author: bugman
Date: Tue Oct 16 14:18:28 2012
New Revision: 17860

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

........
  r17858 | bugman | 2012-10-16 14:14:20 +0200 (Tue, 16 Oct 2012) | 5 lines
  
  Python 3 fix for the generic_fns.structure.geometric.angles_regular() 
function.
  
  Integer divisions no longer produce integers.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/generic_fns/structure/geometric.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct 16 14:18:28 2012
@@ -1,1 +1,1 @@
-/trunk:1-17856
+/trunk:1-17859

Modified: branches/frame_order_testing/generic_fns/structure/geometric.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/geometric.py?rev=17860&r1=17859&r2=17860&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/structure/geometric.py (original)
+++ branches/frame_order_testing/generic_fns/structure/geometric.py Tue Oct 
16 14:18:28 2012
@@ -57,7 +57,7 @@
     # Generate the increment values of v.
     v = zeros(inc/2+1, float64)
     val = 1.0 / float(inc/2)
-    for i in range(inc/2+1):
+    for i in range(int(inc/2+1)):
         v[i] = float(i) * val
 
     # Generate the distribution of spherical angles theta.