Author: bugman Date: Wed Apr 5 09:40:34 2006 New Revision: 2445 URL: http://svn.gna.org/viewcvs/relax?rev=2445&view=rev Log: Added the ability to create hybrid runs.
This code is for task #3122 located at https://gna.org/task/?func=detailitem&item_id=3122. The modifications allow the user function 'run.hybridise()' to create a run type called 'hybrid'. All the tests for allowing hybridisation are done however, nothing can be done with the run yet. Modified: 1.2/prompt/run.py 1.2/specific_fns/__init__.py 1.2/specific_fns/main.py 1.2/specific_fns/specific_setup.py Modified: 1.2/prompt/run.py URL: http://svn.gna.org/viewcvs/relax/1.2/prompt/run.py?rev=2445&r1=2444&r2=2445&view=diff ============================================================================== --- 1.2/prompt/run.py (original) +++ 1.2/prompt/run.py Wed Apr 5 09:40:34 2006 @@ -170,4 +170,4 @@ raise RelaxListStrError, ('runs', runs) # Execute the functional code. - self.__relax__.generic.runs.hybridise(hybrid=hybrid, runs=runs) + self.__relax__.specific.hybrid.hybridise(hybrid=hybrid, runs=runs) Modified: 1.2/specific_fns/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.2/specific_fns/__init__.py?rev=2445&r1=2444&r2=2445&view=diff ============================================================================== --- 1.2/specific_fns/__init__.py (original) +++ 1.2/specific_fns/__init__.py Wed Apr 5 09:40:34 2006 @@ -1,6 +1,6 @@ ############################################################################### # # -# Copyright (C) 2004 Edward d'Auvergne # +# Copyright (C) 2004, 2006 Edward d'Auvergne # # # # This file is part of the program relax. # # # @@ -22,6 +22,7 @@ __all__ = [ 'base_class', + 'hybrid', 'jw_mapping', 'main', 'model_free', Modified: 1.2/specific_fns/main.py URL: http://svn.gna.org/viewcvs/relax/1.2/specific_fns/main.py?rev=2445&r1=2444&r2=2445&view=diff ============================================================================== --- 1.2/specific_fns/main.py (original) +++ 1.2/specific_fns/main.py Wed Apr 5 09:40:34 2006 @@ -1,6 +1,6 @@ ############################################################################### # # -# Copyright (C) 2004 Edward d'Auvergne # +# Copyright (C) 2004, 2006 Edward d'Auvergne # # # # This file is part of the program relax. # # # @@ -21,6 +21,7 @@ ############################################################################### +from hybrid import Hybrid from jw_mapping import Jw_mapping from model_free import Model_free from noe import Noe @@ -36,6 +37,7 @@ self.relax = relax # Set up all the functions + self.hybrid = Hybrid(self.relax) self.jw_mapping = Jw_mapping(self.relax) self.model_free = Model_free(self.relax) self.noe = Noe(self.relax) Modified: 1.2/specific_fns/specific_setup.py URL: http://svn.gna.org/viewcvs/relax/1.2/specific_fns/specific_setup.py?rev=2445&r1=2444&r2=2445&view=diff ============================================================================== --- 1.2/specific_fns/specific_setup.py (original) +++ 1.2/specific_fns/specific_setup.py Wed Apr 5 09:40:34 2006 @@ -52,6 +52,10 @@ # Model-free analysis. if function_type == 'mf': string = "Model-free analysis" + + # Hybrid models. + if function_type == 'hybrid': + string = "hybrid models" return string _______________________________________________ relax (http://nmr-relax.com) This is the relax-commits mailing list relax-commits@gna.org To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-commits
