Author: bugman Date: Wed Sep 24 23:31:34 2008 New Revision: 7291 URL: http://svn.gna.org/viewcvs/relax?rev=7291&view=rev Log: Reverted the hack of r7290. The command used was: svn merge -r7290:7289 . Modified: 1.3/generic_fns/mol_res_spin.py Modified: 1.3/generic_fns/mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/mol_res_spin.py?rev=7291&r1=7290&r2=7291&view=diff ============================================================================== --- 1.3/generic_fns/mol_res_spin.py (original) +++ 1.3/generic_fns/mol_res_spin.py Wed Sep 24 23:31:34 2008 @@ -374,7 +374,7 @@ # The selection object is an intersection. elif self._intersect: - return self._intersect[0].contains_spin(spin_num, spin_name, res_num, res_name, mol) or self._intersect[1].contains_spin(spin_num, spin_name, res_num, res_name, mol) + return self._intersect[0].contains_spin(spin_num, spin_name, res_num, res_name, mol) and self._intersect[1].contains_spin(spin_num, spin_name, res_num, res_name, mol) # Does it contain the molecule. select_mol = self.contains_mol(mol)