r16994 - /branches/interatomic/generic_fns/dipole_pair.py -- June 20, 2012 - 01:47

Author: bugman
Date: Wed Jun 20 01:47:08 2012
New Revision: 16994

URL: http://svn.gna.org/viewcvs/relax?rev=16994&view=rev
Log:
Bug fix for the dipole_pair.define user function when structural data is 
missing.


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=16994&r1=16993&r2=16994&view=diff
==============================================================================
--- branches/interatomic/generic_fns/dipole_pair.py (original)
+++ branches/interatomic/generic_fns/dipole_pair.py Wed Jun 20 01:47:08 2012
@@ -78,9 +78,9 @@
                         pair = True
 
                     # Same residue, so skip.
-                    if pair and res_num1 != None and res_num1 == res_num2:
+                    if pair and res_num1 != None and res_num1 != res_num2:
                         continue
-                    elif pair and res_num1 == None and res_name1 == 
res_name2:
+                    elif pair and res_num1 == None and res_name1 != 
res_name2:
                         continue
 
             # Get the interatomic data object, if it exists.