r16869 - in /branches/interatomic: data/interatomic.py generic_fns/interatomic.py -- June 11, 2012 - 22:25

Author: bugman
Date: Mon Jun 11 22:25:24 2012
New Revision: 16869

URL: http://svn.gna.org/viewcvs/relax?rev=16869&view=rev
Log:
The generic_fns.interatomic.create_interatom() function now returns the 
created container.

This comes from the InteratomicContainer.add_item() method which now also 
returns the container.


Modified:
    branches/interatomic/data/interatomic.py
    branches/interatomic/generic_fns/interatomic.py

Modified: branches/interatomic/data/interatomic.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/data/interatomic.py?rev=16869&r1=16868&r2=16869&view=diff
==============================================================================
--- branches/interatomic/data/interatomic.py (original)
+++ branches/interatomic/data/interatomic.py Mon Jun 11 22:25:24 2012
@@ -135,6 +135,8 @@
         @type spin_id1:     str
         @keyword spin_id2:  The spin ID string of the first atom.
         @type spin_id2:     str
+        @return:            The new interatomic data container.
+        @rtype:             InteratomContainer instance
         """
 
         # Check if the two spin ID have already been added.
@@ -143,7 +145,11 @@
                 raise RelaxError("The spin pair %s and %s have already been 
added." % (spin_id1, spin_id2))
 
         # Append a new InteratomContainer.
-        self.append(InteratomContainer(spin_id1, spin_id2))
+        cont = InteratomContainer(spin_id1, spin_id2)
+        self.append(cont)
+
+        # Return the container.
+        return cont
 
 
     def is_empty(self):

Modified: branches/interatomic/generic_fns/interatomic.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/generic_fns/interatomic.py?rev=16869&r1=16868&r2=16869&view=diff
==============================================================================
--- branches/interatomic/generic_fns/interatomic.py (original)
+++ branches/interatomic/generic_fns/interatomic.py Mon Jun 11 22:25:24 2012
@@ -48,8 +48,8 @@
     if spin == None:
         raise RelaxNoSpinWarning(spin_id2)
 
-    # Add the data.
-    cdp.interatomic.add_item(spin_id1=spin_id1, spin_id2=spin_id2)
+    # Add and return the data.
+    return cdp.interatomic.add_item(spin_id1=spin_id1, spin_id2=spin_id2)
 
 
 def return_interatom(spin_id1=None, spin_id2=None, pipe=None):