Author: bugman
Date: Sun Nov 25 18:02:00 2007
New Revision: 3922
URL: http://svn.gna.org/viewcvs/relax?rev=3922&view=rev
Log:
Removed all of the generic_fns class instances from the relax namespace.
All these class methods will be converted to module functions.
Removed:
1.3/generic_fns/main.py
Modified:
1.3/relax
Removed: 1.3/generic_fns/main.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/main.py?rev=3921&view=auto
==============================================================================
--- 1.3/generic_fns/main.py (original)
+++ 1.3/generic_fns/main.py (removed)
@@ -1,68 +1,0 @@
-###############################################################################
-#
#
-# Copyright (C) 2004-2005 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 angles import Angles
-from dx.opendx import OpenDX
-from dasha import Dasha
-from eliminate import Eliminate
-from fix import Fix
-from grace import Grace
-from intensity import Intensity
-from minimise import Minimise
-from model_selection import Model_selection
-from molmol import Molmol
-from monte_carlo import Monte_carlo
-from nuclei import Nuclei
-from palmer import Palmer
-from structure import Structure
-from pymol import Pymol
-from results import Results
-from value import Value
-from vmd import Vmd
-
-
-class Generic:
- def __init__(self, relax):
- """Class containing all the generic functions."""
-
- # Place the program class structure under self.relax
- self.relax = relax
-
- # Set up all the classes.
- self.angles = Angles(self.relax)
- self.dasha = Dasha(self.relax)
- self.eliminate = Eliminate(self.relax)
- self.fix = Fix(self.relax)
- self.grace = Grace(self.relax)
- self.intensity = Intensity(self.relax)
- self.minimise = Minimise(self.relax)
- self.model_selection = Model_selection(self.relax)
- self.molmol = Molmol(self.relax)
- self.monte_carlo = Monte_carlo(self.relax)
- self.nuclei = Nuclei(self.relax)
- self.opendx = OpenDX(self.relax)
- self.palmer = Palmer(self.relax)
- self.structure = Structure(self.relax)
- self.pymol = Pymol(self.relax)
- self.results = Results(self.relax)
- self.value = Value(self.relax)
- self.vmd = Vmd(self.relax)
Modified: 1.3/relax
URL:
http://svn.gna.org/viewcvs/relax/1.3/relax?rev=3922&r1=3921&r2=3922&view=diff
==============================================================================
--- 1.3/relax (original)
+++ 1.3/relax Sun Nov 25 18:02:00 2007
@@ -65,7 +65,7 @@
# relax modules.
from colour import Colour
-from generic_fns.main import Generic
+import generic_fns
from prompt.gpl import gpl
from prompt import interpreter
import relax_errors
@@ -115,7 +115,7 @@
self.specific_setup = Specific_setup(self)
# Setup the object containing the generic functions.
- self.generic = Generic(self)
+ self.generic = generic_fns
# Setup the object containing the specific functions.
self.specific = Specific(self)
r3922 - in /1.3: generic_fns/main.py relax