r16525 - /branches/uf_redesign/specific_fns/noe/main.py -- May 29, 2012 - 18:26

Author: bugman
Date: Tue May 29 18:26:17 2012
New Revision: 16525

URL: http://svn.gna.org/viewcvs/relax?rev=16525&view=rev
Log:
Deleted the NOE data_names() specific analysis method.

This should operate through the base methods now.


Modified:
    branches/uf_redesign/specific_fns/noe/main.py

Modified: branches/uf_redesign/specific_fns/noe/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/specific_fns/noe/main.py?rev=16525&r1=16524&r2=16525&view=diff
==============================================================================
--- branches/uf_redesign/specific_fns/noe/main.py (original)
+++ branches/uf_redesign/specific_fns/noe/main.py Tue May 29 18:26:17 2012
@@ -139,72 +139,6 @@
             spin.noe_err = sqrt((sat_err * ref)**2 + (ref_err * sat)**2) / 
ref**2
 
 
-    def data_names(self, set='all', error_names=False, sim_names=False):
-        """Return a list of all spin container specific model-free object 
names.
-
-        Description
-        ===========
-
-        The names are as follows:
-
-            - 'model', the model-free model name.
-            - 'equation', the model-free equation type.
-            - 'params', an array of the model-free parameter names 
associated with the model.
-            - 's2', S2.
-            - 's2f', S2f.
-            - 's2s', S2s.
-            - 'local_tm', local tm.
-            - 'te', te.
-            - 'tf', tf.
-            - 'ts', ts.
-            - 'rex', Rex.
-            - 'r', bond length.
-            - 'csa', CSA value.
-            - 'nucleus', the heteronucleus type.
-            - 'chi2', chi-squared value.
-            - 'iter', iterations.
-            - 'f_count', function count.
-            - 'g_count', gradient count.
-            - 'h_count', hessian count.
-            - 'warning', minimisation warning.
-
-
-        @keyword set:           The set of object names to return.  This can 
be set to 'all' for all
-                                names, to 'generic' for generic object 
names, 'params' for
-                                model-free parameter names, or to 'min' for 
minimisation specific
-                                object names.
-        @type set:              str
-        @keyword error_names:   A flag which if True will add the error 
object names as well.
-        @type error_names:      bool
-        @keyword sim_names:     A flag which if True will add the Monte 
Carlo simulation object
-                                names as well.
-        @type sim_names:        bool
-        @return:                The list of object names.
-        @rtype:                 list of str
-        """
-
-        # Initialise.
-        names = []
-
-        # Generic.
-        if set == 'all' or set == 'generic':
-            names.append('select')
-            names.append('fixed')
-            names.append('ref')
-            names.append('sat')
-
-        # Parameters.
-        if set == 'all' or set == 'params':
-            names.append('noe')
-
-        # Parameter errors.
-        if error_names and (set == 'all' or set == 'params'):
-            names.append('noe_err')
-
-        # Return the names.
-        return names
-
-
     def overfit_deselect(self):
         """Deselect spins which have insufficient data to support 
calculation."""