r4787 - in /1.3/specific_fns: base_class.py jw_mapping.py noe.py relax_fit.py -- January 16, 2008 - 16:37

Author: bugman
Date: Wed Jan 16 16:37:07 2008
New Revision: 4787

URL: http://svn.gna.org/viewcvs/relax?rev=4787&view=rev
Log:
Shifted all the dummy return_conversion_factor() methods which return 1 into 
the base class.


Modified:
    1.3/specific_fns/base_class.py
    1.3/specific_fns/jw_mapping.py
    1.3/specific_fns/noe.py
    1.3/specific_fns/relax_fit.py

Modified: 1.3/specific_fns/base_class.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/base_class.py?rev=4787&r1=4786&r2=4787&view=diff
==============================================================================
--- 1.3/specific_fns/base_class.py (original)
+++ 1.3/specific_fns/base_class.py Wed Jan 16 16:37:07 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: 1.3/specific_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/jw_mapping.py?rev=4787&r1=4786&r2=4787&view=diff
==============================================================================
--- 1.3/specific_fns/jw_mapping.py (original)
+++ 1.3/specific_fns/jw_mapping.py Wed Jan 16 16:37:07 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: 1.3/specific_fns/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/noe.py?rev=4787&r1=4786&r2=4787&view=diff
==============================================================================
--- 1.3/specific_fns/noe.py (original)
+++ 1.3/specific_fns/noe.py Wed Jan 16 16:37:07 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: 1.3/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=4787&r1=4786&r2=4787&view=diff
==============================================================================
--- 1.3/specific_fns/relax_fit.py (original)
+++ 1.3/specific_fns/relax_fit.py Wed Jan 16 16:37:07 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."""