r4788 - in /branches/N_state_model: ./ specific_fns/ specific_fns/model_free/ -- January 16, 2008 - 16:44

Author: bugman
Date: Wed Jan 16 16:44:49 2008
New Revision: 4788

URL: http://svn.gna.org/viewcvs/relax?rev=4788&view=rev
Log:
Merged revisions 4785-4787 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r4785 | semor | 2008-01-16 16:08:42 +0100 (Wed, 16 Jan 2008) | 5 lines
  
  Corrected a function spacing so it has 2 preceding empty lines.
  
  This was pointed by the 'code_validator' script.
........
  r4787 | bugman | 2008-01-16 16:37:07 +0100 (Wed, 16 Jan 2008) | 3 lines
  
  Shifted all the dummy return_conversion_factor() methods which return 1 
into the base class.
........

Modified:
    branches/N_state_model/   (props changed)
    branches/N_state_model/specific_fns/base_class.py
    branches/N_state_model/specific_fns/jw_mapping.py
    branches/N_state_model/specific_fns/model_free/mf_minimise.py
    branches/N_state_model/specific_fns/noe.py
    branches/N_state_model/specific_fns/relax_fit.py

Propchange: branches/N_state_model/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: branches/N_state_model/specific_fns/base_class.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/base_class.py?rev=4788&r1=4787&r2=4788&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/base_class.py (original)
+++ branches/N_state_model/specific_fns/base_class.py Wed Jan 16 16:44:49 2008
@@ -70,6 +70,12 @@
 
     def overfit_deselect(self):
         """Dummy function, nornally for deselecting spins with insufficient 
data for minimisation."""
+
+
+    def return_conversion_factor(self, stat_type):
+        """Dummy function for returning 1.0."""
+
+        return 1.0
 
 
     def return_data(self, spin):

Modified: branches/N_state_model/specific_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/jw_mapping.py?rev=4788&r1=4787&r2=4788&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/jw_mapping.py (original)
+++ branches/N_state_model/specific_fns/jw_mapping.py Wed Jan 16 16:44:49 2008
@@ -272,12 +272,6 @@
                 continue
 
 
-    def return_conversion_factor(self, stat_type):
-        """Dummy function for returning 1.0."""
-
-        return 1.0
-
-
     def return_data_name(self, name):
         """
         Reduced spectral density mapping data type string matching patterns

Modified: branches/N_state_model/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/model_free/mf_minimise.py?rev=4788&r1=4787&r2=4788&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/model_free/mf_minimise.py (original)
+++ branches/N_state_model/specific_fns/model_free/mf_minimise.py Wed Jan 16 
16:44:49 2008
@@ -39,6 +39,7 @@
 class Mf_minimise:
     """Class containing functions specific to model-free optimisation."""
 
+
     def back_calc(self, run=None, index=None, ri_label=None, frq_label=None, 
frq=None):
         """Back-calculation of relaxation data from the model-free parameter 
values."""
 

Modified: branches/N_state_model/specific_fns/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/noe.py?rev=4788&r1=4787&r2=4788&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/noe.py (original)
+++ branches/N_state_model/specific_fns/noe.py Wed Jan 16 16:44:49 2008
@@ -231,12 +231,6 @@
                 data.noe_err = None
 
 
-    def return_conversion_factor(self, stat_type):
-        """Dummy function for returning 1.0."""
-
-        return 1.0
-
-
     def return_data_name(self, name):
         """
         NOE calculation data type string matching patterns

Modified: branches/N_state_model/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/relax_fit.py?rev=4788&r1=4787&r2=4788&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/relax_fit.py (original)
+++ branches/N_state_model/specific_fns/relax_fit.py Wed Jan 16 16:44:49 2008
@@ -883,12 +883,6 @@
         self.relax.generic.intensity.read(run=run, file=file, dir=dir, 
format=format, heteronuc=heteronuc, proton=proton, int_col=int_col, 
assign_func=self.assign_function)
 
 
-    def return_conversion_factor(self, stat_type):
-        """Dummy function for returning 1.0."""
-
-        return 1.0
-
-
     def return_data(self, run, i):
         """Function for returning the peak intensity data structure."""