Author: bugman Date: Fri Nov 16 10:48:46 2012 New Revision: 17988 URL: http://svn.gna.org/viewcvs/relax?rev=17988&view=rev Log: Merged revisions 17987 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r17987 | bugman | 2012-11-16 10:47:35 +0100 (Fri, 16 Nov 2012) | 5 lines Fix for model elimination in the modsel.py model-free sample script. The eliminate user function should be applied to each data pipe separately. ........ Modified: branches/frame_order_testing/ (props changed) branches/frame_order_testing/sample_scripts/model_free/modsel.py Propchange: branches/frame_order_testing/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri Nov 16 10:48:46 2012 @@ -1,1 +1,1 @@ -/trunk:1-17982 +/trunk:1-17987 Modified: branches/frame_order_testing/sample_scripts/model_free/modsel.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/sample_scripts/model_free/modsel.py?rev=17988&r1=17987&r2=17988&view=diff ============================================================================== --- branches/frame_order_testing/sample_scripts/model_free/modsel.py (original) +++ branches/frame_order_testing/sample_scripts/model_free/modsel.py Fri Nov 16 10:48:46 2012 @@ -1,6 +1,6 @@ ############################################################################### # # -# Copyright (C) 2003-2008 Edward d'Auvergne # +# Copyright (C) 2003-2012 Edward d'Auvergne # # # # This file is part of the program relax (http://www.nmr-relax.com). # # # @@ -35,8 +35,8 @@ # Reload precalculated results from the files 'm1/results', etc. results.read(file='results', dir=name) -# Model elimination. -eliminate() + # Model elimination. + eliminate() # Model selection. model_selection(method='AIC', modsel_pipe='aic')