Author: bugman
Date: Mon Mar 14 18:55:30 2011
New Revision: 12806
URL: http://svn.gna.org/viewcvs/relax?rev=12806&view=rev
Log:
Deleted the SRLS analysis type - there is no incentive to develop this part
of relax.
Removed:
1.3/specific_fns/srls.py
Modified:
1.3/generic_fns/exp_info.py
1.3/generic_fns/pipes.py
1.3/prompt/bmrb.py
1.3/prompt/pipe.py
1.3/specific_fns/__init__.py
1.3/specific_fns/setup.py
Modified: 1.3/generic_fns/exp_info.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/exp_info.py?rev=12806&r1=12805&r2=12806&view=diff
==============================================================================
--- 1.3/generic_fns/exp_info.py (original)
+++ 1.3/generic_fns/exp_info.py Mon Mar 14 18:55:30 2011
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2008-2010 Edward d'Auvergne
#
+# Copyright (C) 2008-2011 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -230,8 +230,7 @@
'mf',
'N-state',
'noe',
- 'relax_fit',
- 'srls'
+ 'relax_fit'
]
if analysis_type not in allowed:
raise RelaxError("The analysis type '%s' should be one of %s." %
(analysis_type, allowed))
Modified: 1.3/generic_fns/pipes.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pipes.py?rev=12806&r1=12805&r2=12806&view=diff
==============================================================================
--- 1.3/generic_fns/pipes.py (original)
+++ 1.3/generic_fns/pipes.py Mon Mar 14 18:55:30 2011
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2004, 2006-2009 Edward d'Auvergne
#
+# Copyright (C) 2004, 2006-2011 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -34,7 +34,7 @@
# List of valid data pipe types.
-VALID_TYPES = ['ct', 'frame order', 'jw', 'hybrid', 'mf', 'N-state', 'noe',
'relax_fit', 'relax_disp', 'srls']
+VALID_TYPES = ['ct', 'frame order', 'jw', 'hybrid', 'mf', 'N-state', 'noe',
'relax_fit', 'relax_disp']
def copy(pipe_from=None, pipe_to=None):
@@ -79,7 +79,6 @@
'noe': Steady state NOE calculation,
'relax_fit': Relaxation curve fitting,
'relax_disp': Relaxation dispersion,
- 'srls': SRLS analysis.
@type pipe_type: str
@keyword switch: If True, this new pipe will be switched to,
otherwise the current data pipe
will remain as is.
Modified: 1.3/prompt/bmrb.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/prompt/bmrb.py?rev=12806&r1=12805&r2=12806&view=diff
==============================================================================
--- 1.3/prompt/bmrb.py (original)
+++ 1.3/prompt/bmrb.py Mon Mar 14 18:55:30 2011
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2003-2005,2008-2010 Edward d'Auvergne
#
+# Copyright (C) 2003-2005,2008-2011 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -255,7 +255,6 @@
'N-state': N-state model of domain motions,
'noe': Steady state NOE calculation,
'relax_fit': Relaxation curve fitting,
- 'srls': SRLS analysis.
The model_selection argument only needs to be set if the script
selects between different
mathematical models. This can be anything, but the following are
recommended:
Modified: 1.3/prompt/pipe.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/prompt/pipe.py?rev=12806&r1=12805&r2=12806&view=diff
==============================================================================
--- 1.3/prompt/pipe.py (original)
+++ 1.3/prompt/pipe.py Mon Mar 14 18:55:30 2011
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2004-2010 Edward d'Auvergne
#
+# Copyright (C) 2004-2011 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -109,7 +109,6 @@
'N-state': N-state model of domain motions,
'noe': Steady state NOE calculation,
'relax_fit': Relaxation curve fitting,
- 'srls': SRLS analysis.
Examples
Modified: 1.3/specific_fns/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/__init__.py?rev=12806&r1=12805&r2=12806&view=diff
==============================================================================
--- 1.3/specific_fns/__init__.py (original)
+++ 1.3/specific_fns/__init__.py Mon Mar 14 18:55:30 2011
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2004, 2006-2009 Edward d'Auvergne
#
+# Copyright (C) 2004, 2006-2011 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -35,6 +35,5 @@
'n_state_model',
'noe',
'relax_fit',
- 'setup',
- 'srls'
+ 'setup'
]
Modified: 1.3/specific_fns/setup.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/setup.py?rev=12806&r1=12805&r2=12806&view=diff
==============================================================================
--- 1.3/specific_fns/setup.py (original)
+++ 1.3/specific_fns/setup.py Mon Mar 14 18:55:30 2011
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2004, 2006-2009 Edward d'Auvergne
#
+# Copyright (C) 2004, 2006-2011 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -29,7 +29,6 @@
from specific_fns.n_state_model import N_state_model
from specific_fns.noe import Noe
from specific_fns.relax_fit import Relax_fit
-from specific_fns.srls import SRLS
from relax_errors import RelaxError, RelaxFuncSetupError
@@ -42,7 +41,6 @@
n_state_model_obj = N_state_model()
noe_obj = Noe()
relax_fit_obj = Relax_fit()
-srls_obj = SRLS()
# The function for returning the requested specific function.
@@ -289,10 +287,6 @@
if function_type == 'hybrid':
return hybrid_obj
- # SRLS.
- if function_type == 'srls':
- return srls_obj
-
# Unknown analysis.
raise RelaxError("The function_type " + repr(function_type) + " is
unknown.")
@@ -332,9 +326,5 @@
if function_type == 'hybrid':
return "hybrid models"
- # SRLS
- if function_type == 'srls':
- return "SRLS analysis"
-
# Unknown analysis.
raise RelaxError("The function_type " + repr(function_type) + " is
unknown.")
Removed: 1.3/specific_fns/srls.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/srls.py?rev=12805&view=auto
==============================================================================
--- 1.3/specific_fns/srls.py (original)
+++ 1.3/specific_fns/srls.py (removed)
@@ -1,33 +1,0 @@
-###############################################################################
-#
#
-# Copyright (C) 2009 Edward d'Auvergne
#
-#
#
-# This file is part of the program relax.
#
-#
#
-# relax is free software; you can redistribute it and/or modify
#
-# it under the terms of the GNU General Public License as published by
#
-# the Free Software Foundation; either version 2 of the License, or
#
-# (at your option) any later version.
#
-#
#
-# relax is distributed in the hope that it will be useful,
#
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#
-# GNU General Public License for more details.
#
-#
#
-# You should have received a copy of the GNU General Public License
#
-# along with relax; if not, write to the Free Software
#
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-#
#
-###############################################################################
-
-# Module docstring.
-"""Module for the SRLS analysis of relaxation data."""
-
-
-# relax module imports.
-from specific_fns.api_base import API_base
-
-
-class SRLS(API_base):
- """Class containing functions specific to the SRLS analysis."""
-
r12806 - in /1.3: generic_fns/ prompt/ specific_fns/