r4677 - /1.3/specific_fns/__init__.py -- January 13, 2008 - 17:31

Author: bugman
Date: Sun Jan 13 17:31:48 2008
New Revision: 4677

URL: http://svn.gna.org/viewcvs/relax?rev=4677&view=rev
Log:
Renamed all the instantiated classes in specific_fns.__init__.

This is to avoid name clashes and the overwriting of the module names.


Modified:
    1.3/specific_fns/__init__.py

Modified: 1.3/specific_fns/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/__init__.py?rev=4677&r1=4676&r2=4677&view=diff
==============================================================================
--- 1.3/specific_fns/__init__.py (original)
+++ 1.3/specific_fns/__init__.py Sun Jan 13 17:31:48 2008
@@ -43,12 +43,12 @@
             'relax_data',
             'relax_fit']
 
-# Set up all the classes.
-hybrid = Hybrid()
-jw_mapping = Jw_mapping()
-model_free = Model_free()
-noe = Noe()
-relax_fit = Relax_fit()
+# Instantiate all classes.
+hybrid_obj = Hybrid()
+jw_mapping_obj = Jw_mapping()
+model_free_obj = Model_free()
+noe_obj = Noe()
+relax_fit_obj = Relax_fit()
 
 
 # The function for returning the requested specific function.
@@ -225,23 +225,23 @@
 
     # NOE calculation.
     if function_type == 'noe':
-        return noe
+        return noe_obj
 
     # Relaxation curve fitting.
     if function_type == 'relax_fit':
-        return relax_fit
+        return relax_fit_obj
 
     # Reduced spectral density mapping.
     if function_type == 'jw':
-        return jw_mapping
+        return jw_mapping_obj
 
     # Model-free analysis.
     if function_type == 'mf':
-        return model_free
+        return model_free_obj
 
     # Hybrid models.
     if function_type == 'hybrid':
-        return hybrid
+        return hybrid_obj
 
     # Unknown analysis.
     raise RelaxError, "The function_type " + `function_type` + " is unknown."