Author: bugman Date: Thu Feb 14 17:58:06 2013 New Revision: 18472 URL: http://svn.gna.org/viewcvs/relax?rev=18472&view=rev Log: Merged revisions 18471 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r18471 | bugman | 2013-02-14 13:30:02 +0100 (Thu, 14 Feb 2013) | 3 lines Fix for the new 'mol_name_target' argument for the structure.load_spins user function - it can be None. ........ Modified: branches/frame_order_testing/ (props changed) branches/frame_order_testing/user_functions/structure.py Propchange: branches/frame_order_testing/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Thu Feb 14 17:58:06 2013 @@ -1,1 +1,1 @@ -/trunk:1-18465 +/trunk:1-18471 Modified: branches/frame_order_testing/user_functions/structure.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/user_functions/structure.py?rev=18472&r1=18471&r2=18472&view=diff ============================================================================== --- branches/frame_order_testing/user_functions/structure.py (original) +++ branches/frame_order_testing/user_functions/structure.py Thu Feb 14 17:58:06 2013 @@ -433,7 +433,8 @@ name = "mol_name_target", py_type = "str", desc_short = "target molecule name", - desc = "The name of target molecule container, overriding the name of the loaded structures." + desc = "The name of target molecule container, overriding the name of the loaded structures.", + can_be_none = True ) uf.add_keyarg( name = "ave_pos",