r17043 - /branches/interatomic/generic_fns/dipole_pair.py -- June 22, 2012 - 19:04

Author: bugman
Date: Fri Jun 22 19:04:55 2012
New Revision: 17043

URL: http://svn.gna.org/viewcvs/relax?rev=17043&view=rev
Log:
Bug fix for the dipole_pair.unit_vectors user function positional checking.

The arg_check.is_float() function needs the raise_error flag turned off.


Modified:
    branches/interatomic/generic_fns/dipole_pair.py

Modified: branches/interatomic/generic_fns/dipole_pair.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/generic_fns/dipole_pair.py?rev=17043&r1=17042&r2=17043&view=diff
==============================================================================
--- branches/interatomic/generic_fns/dipole_pair.py (original)
+++ branches/interatomic/generic_fns/dipole_pair.py Fri Jun 22 19:04:55 2012
@@ -288,14 +288,14 @@
         pos_info = True
 
         # Both single positions.
-        if is_float(spin1.pos[0]) and is_float(spin2.pos[0]):
+        if is_float(spin1.pos[0], raise_error=False) and 
is_float(spin2.pos[0], raise_error=False):
             # The vector.
             vector_list = [spin2.pos - spin1.pos]
 
         # A single and multiple position pair.
-        elif is_float(spin1.pos[0]) or is_float(spin2.pos[0]):
+        elif is_float(spin1.pos[0], raise_error=False) or 
is_float(spin2.pos[0], raise_error=False):
             # The first spin has multiple positions.
-            if is_float(spin2.pos[0]):
+            if is_float(spin2.pos[0], raise_error=False):
                 vector_list = []
                 for i in range(len(spin1.pos)):
                     vector_list.append(spin2.pos - spin1.pos[i])
@@ -349,7 +349,7 @@
 
         # Print out.
         num = 1
-        if not is_float(vector_list[0]):
+        if not is_float(vector_list[0], raise_error=False):
             num = len(vector_list)
         plural = 's'
         if num == 1: