r5698 - /1.3/generic_fns/selection.py -- April 14, 2008 - 17:37

Author: bugman
Date: Mon Apr 14 17:33:29 2008
New Revision: 5698

URL: http://svn.gna.org/viewcvs/relax?rev=5698&view=rev
Log:
A few minor changes to the Selection object.


Modified:
    1.3/generic_fns/selection.py

Modified: 1.3/generic_fns/selection.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/selection.py?rev=5698&r1=5697&r2=5698&view=diff
==============================================================================
--- 1.3/generic_fns/selection.py (original)
+++ 1.3/generic_fns/selection.py Mon Apr 14 17:33:29 2008
@@ -146,28 +146,36 @@
 
 
     def intersection(self, select_obj0, select_obj1):
-        """Make a Selection object the intersection of two Selection objects
-
-        @type select_obj0: Instance of class Selection
-        @param select_obj0: First Selection object in intersection
-        @type select_obj1: Instance of class Selection
-        @param select_obj1: First Selection object in intersection"""
-
+        """Make this Selection object the intersection of two other 
Selection objects.
+
+        @param select_obj0: First Selection object in intersection.
+        @type select_obj0:  Selection instance.
+        @param select_obj1: First Selection object in intersection.
+        @type select_obj1:  Selection instance.
+        """
+
+        # Check that nothing is set.
         if self._union or self._intersect or self.molecules or self.residues 
or self.spins:
             raise RelaxError, "Cannot define multiple Boolean relationships 
between Selection objects"
+
+        # Create the intersection.
         self._intersect = (select_obj0, select_obj1)
 
 
     def union(self, select_obj0, select_obj1):
-        """Make a Selection object the union of two Selection objects
-
-        @type select_obj0: Instance of class Selection
-        @param select_obj0: First Selection object in union
-        @type select_obj1: Instance of class Selection
-        @param select_obj1: First Selection object in union"""
-
+        """Make this Selection object the union of two other Selection 
objects.
+
+        @param select_obj0: First Selection object in intersection.
+        @type select_obj0:  Selection instance.
+        @param select_obj1: First Selection object in intersection.
+        @type select_obj1:  Selection instance.
+        """
+
+        # Check that nothing is set.
         if self._union or self._intersect or self.molecules or self.residues 
or self.spins:
             raise RelaxError, "Cannot define multiple Boolean relationships 
between Selection objects"
+
+        # Create the union.
         self._union = (select_obj0, select_obj1)