Author: han87 Date: Wed Jul 27 17:58:05 2011 New Revision: 13933 URL: http://svn.gna.org/viewcvs/relax?rev=13933&view=rev Log: Reverted r as it contains several unrelated changes. The command used was: svn merge -r 13931:13924 . This commit contains several unrelated changes in /generic_fns/structure/main.py and /prompt/structure.py. Modified: branches/xyz/generic_fns/structure/main.py branches/xyz/prompt/structure.py Modified: branches/xyz/generic_fns/structure/main.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/generic_fns/structure/main.py?rev=13933&r1=13932&r2=13933&view=diff ============================================================================== --- branches/xyz/generic_fns/structure/main.py (original) +++ branches/xyz/generic_fns/structure/main.py Wed Jul 27 17:58:05 2011 @@ -244,8 +244,6 @@ # Got something! if res_cont != None: - # Rename the residue number - res_cont.num = res_num # Rename the residue name if the res name is given and the sole container is unnamed. if res_cont.name == None and res_name: # Print out. Modified: branches/xyz/prompt/structure.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/prompt/structure.py?rev=13933&r1=13932&r2=13933&view=diff ============================================================================== --- branches/xyz/prompt/structure.py (original) +++ branches/xyz/prompt/structure.py Wed Jul 27 17:58:05 2011 @@ -580,7 +580,7 @@ - def vectors(self, attached='H', spin_id=None, model=None, verbosity=1, ave=True, unit=True): + def vectors(self, attached='H', spin_id=None, model=None, verbosity=1, ave=True, unit=False): """Extract and store the bond vectors from the loaded structures in the spin container. Keyword arguments