Author: bugman Date: Thu Jul 2 23:25:33 2009 New Revision: 9185 URL: http://svn.gna.org/viewcvs/relax?rev=9185&view=rev Log: Renamed n_state_model.set_domain() to align_tensor.set_domain(). Modified: branches/frame_order/prompt/align_tensor.py branches/frame_order/prompt/n_state_model.py Modified: branches/frame_order/prompt/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order/prompt/align_tensor.py?rev=9185&r1=9184&r2=9185&view=diff ============================================================================== --- branches/frame_order/prompt/align_tensor.py (original) +++ branches/frame_order/prompt/align_tensor.py Thu Jul 2 23:25:33 2009 @@ -380,6 +380,51 @@ align_tensor.reduction(full_tensor=full_tensor, red_tensor=red_tensor) + def set_domain(self, tensor=None, domain=None): + """Set the domain label for the alignment tensor. + + Keyword Arguments + ~~~~~~~~~~~~~~~~~ + + tensor: The alignment tensor to assign the domain label to. + + domain: The domain label. + + + Description + ~~~~~~~~~~~ + + Prior to optimisation of the N-state model or Frame Order theories, the domain to which each + alignment tensor belongs must be specified. + + + Examples + ~~~~~~~~ + + To link the alignment tensor loaded as 'chi3 C-dom' to the C-terminal domain 'C', type: + + relax> align_tensor.set_domain(tensor='chi3 C-dom', domain='C') + """ + + # Function intro text. + if self.__relax__.interpreter.intro: + text = sys.ps3 + "align_tensor.set_domain(" + text = text + "tensor=" + `tensor` + text = text + ", domain=" + `domain` + ")" + print text + + # Tensor argument. + if type(tensor) != str: + raise RelaxStrError, ('tensor', tensor) + + # Domain argument. + if type(domain) != str: + raise RelaxStrError, ('domain', domain) + + # Execute the functional code. + align_tensor.set_domain(tensor=tensor, domain=domain) + + def svd(self, basis_set=0, tensors=None): """Function for calculating the singular values for all tensors and the condition number. Modified: branches/frame_order/prompt/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order/prompt/n_state_model.py?rev=9185&r1=9184&r2=9185&view=diff ============================================================================== --- branches/frame_order/prompt/n_state_model.py (original) +++ branches/frame_order/prompt/n_state_model.py Thu Jul 2 23:25:33 2009 @@ -332,48 +332,3 @@ # Execute the functional code. n_state_model_obj.select_model(model=model) - - - def set_domain(self, tensor=None, domain=None): - """Set the domain label for the alignment tensor. - - Keyword Arguments - ~~~~~~~~~~~~~~~~~ - - tensor: The alignment tensor to assign the domain label to. - - domain: The domain label. - - - Description - ~~~~~~~~~~~ - - Prior to optimisation of the N-state model, the domain to which each alignment tensor - belongs must be specified. - - - Examples - ~~~~~~~~ - - To link the alignment tensor loaded as 'chi3 C-dom' to the C-terminal domain 'C', type: - - relax> n_state_model.set_domain(tensor='chi3 C-dom', domain='C') - """ - - # Function intro text. - if self.__relax__.interpreter.intro: - text = sys.ps3 + "n_state_model.set_domain(" - text = text + "tensor=" + `tensor` - text = text + ", domain=" + `domain` + ")" - print text - - # Tensor argument. - if type(tensor) != str: - raise RelaxStrError, ('tensor', tensor) - - # Domain argument. - if type(domain) != str: - raise RelaxStrError, ('domain', domain) - - # Execute the functional code. - n_state_model_obj.set_domain(tensor=tensor, domain=domain)