Author: bugman
Date: Sun Dec 9 18:52:14 2007
New Revision: 4152
URL: http://svn.gna.org/viewcvs/relax?rev=4152&view=rev
Log:
Shifted all the specific_fns class imports and initialisations from main.py
to __init__.py.
Removed:
1.3/specific_fns/main.py
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=4152&r1=4151&r2=4152&view=diff
==============================================================================
--- 1.3/specific_fns/__init__.py (original)
+++ 1.3/specific_fns/__init__.py Sun Dec 9 18:52:14 2007
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2004, 2006 Edward d'Auvergne
#
+# Copyright (C) 2004, 2006-2007 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -21,11 +21,25 @@
###############################################################################
+# relax module imports.
+from hybrid import Hybrid
+from jw_mapping import Jw_mapping
+from model_free import Model_free
+from noe import Noe
+from relax_fit import Relax_fit
+
+
+# The available modules.
__all__ = [ 'base_class',
'hybrid',
'jw_mapping',
- 'main',
'model_free',
'noe',
- 'relax_data',
- 'specific_setup' ]
+ 'relax_data']
+
+# Set up all the classes.
+hybrid = Hybrid()
+jw_mapping = Jw_mapping()
+model_free = Model_free()
+noe = Noe()
+relax_fit = Relax_fit()
Removed: 1.3/specific_fns/main.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/main.py?rev=4151&view=auto
==============================================================================
--- 1.3/specific_fns/main.py (original)
+++ 1.3/specific_fns/main.py (removed)
@@ -1,43 +1,0 @@
-###############################################################################
-#
#
-# Copyright (C) 2004, 2006 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
#
-#
#
-###############################################################################
-
-
-from hybrid import Hybrid
-from jw_mapping import Jw_mapping
-from model_free import Model_free
-from noe import Noe
-from relax_fit import Relax_fit
-
-
-class Specific:
- def __init__(self, relax):
- """Class containing all the specific functions."""
-
- # Place the program class structure under self.relax
- self.relax = relax
-
- # Set up all the functions
- self.hybrid = Hybrid(self.relax)
- self.jw_mapping = Jw_mapping(self.relax)
- self.model_free = Model_free(self.relax)
- self.noe = Noe(self.relax)
- self.relax_fit = Relax_fit(self.relax)
r4152 - in /1.3/specific_fns: __init__.py main.py