Author: bugman Date: Wed Feb 11 10:23:45 2015 New Revision: 27624 URL: http://svn.gna.org/viewcvs/relax?rev=27624&view=rev Log: The loading of structural data now sorts the data if the merge flag is True. The pack_structs() method for sorting the data will now call the new MolContainer._sort() function is the data is being merged. This is to ensure that the final structural data is correctly ordered. Modified: trunk/lib/structure/internal/object.py Modified: trunk/lib/structure/internal/object.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/structure/internal/object.py?rev=27624&r1=27623&r2=27624&view=diff ============================================================================== --- trunk/lib/structure/internal/object.py (original) +++ trunk/lib/structure/internal/object.py Wed Feb 11 10:23:45 2015 @@ -2455,6 +2455,9 @@ mol.file_mol_num = orig_mol_num[j] mol.file_model = orig_model_num[i] + # Sort the structural data if a merge occurred. + mol._sort() + def rotate(self, R=None, origin=None, model=None, selection=None): """Rotate the structural information about the given origin.