r17053 - in /branches/interatomic/specific_fns: consistency_tests.py jw_mapping.py -- June 25, 2012 - 13:32

Author: bugman
Date: Mon Jun 25 13:32:12 2012
New Revision: 17053

URL: http://svn.gna.org/viewcvs/relax?rev=17053&view=rev
Log:
Fixes for the J(w) mapping and consistency testing analyses for the 
return_interatom() changes.


Modified:
    branches/interatomic/specific_fns/consistency_tests.py
    branches/interatomic/specific_fns/jw_mapping.py

Modified: branches/interatomic/specific_fns/consistency_tests.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/specific_fns/consistency_tests.py?rev=17053&r1=17052&r2=17053&view=diff
==============================================================================
--- branches/interatomic/specific_fns/consistency_tests.py (original)
+++ branches/interatomic/specific_fns/consistency_tests.py Mon Jun 25 
13:32:12 2012
@@ -28,7 +28,7 @@
 # relax module imports.
 from api_base import API_base
 from api_common import API_common
-from generic_fns.interatomic import return_interatom
+from generic_fns.interatomic import return_interatom_list
 from generic_fns.mol_res_spin import exists_mol_res_spin_data, return_spin, 
spin_loop
 from generic_fns import pipes
 from maths_fns.consistency_tests import Consistency
@@ -134,7 +134,7 @@
                 raise RelaxNoValueError("correlation time")
 
             # Test the interatomic data.
-            interatoms = return_interatom(id)
+            interatoms = return_interatom_list(id)
             for interatom in interatoms:
                 # No relaxation mechanism.
                 if not interatom.dipole_pair:
@@ -202,7 +202,7 @@
                 continue
 
             # Loop over the interatomic data.
-            interatoms = return_interatom(id)
+            interatoms = return_interatom_list(id)
             for i in range(len(interatoms)):
                 # No relaxation mechanism.
                 if not interatoms[i].dipole_pair:

Modified: branches/interatomic/specific_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/specific_fns/jw_mapping.py?rev=17053&r1=17052&r2=17053&view=diff
==============================================================================
--- branches/interatomic/specific_fns/jw_mapping.py (original)
+++ branches/interatomic/specific_fns/jw_mapping.py Mon Jun 25 13:32:12 2012
@@ -27,7 +27,7 @@
 # relax module imports.
 from api_base import API_base
 from api_common import API_common
-from generic_fns.interatomic import return_interatom
+from generic_fns.interatomic import return_interatom_list
 from generic_fns.mol_res_spin import exists_mol_res_spin_data, return_spin, 
spin_loop
 from generic_fns import pipes
 from maths_fns.jw_mapping import Mapping
@@ -123,7 +123,7 @@
                 raise RelaxNoValueError("CSA")
 
             # Test the interatomic data.
-            interatoms = return_interatom(id)
+            interatoms = return_interatom_list(id)
             for interatom in interatoms:
                 # No relaxation mechanism.
                 if not interatom.dipole_pair:
@@ -191,7 +191,7 @@
                 continue
 
             # Loop over the interatomic data.
-            interatoms = return_interatom(id)
+            interatoms = return_interatom_list(id)
             for i in range(len(interatoms)):
                 # No relaxation mechanism.
                 if not interatoms[i].dipole_pair: