r20168 - in /branches/relax_disp: ./ relax.py user_functions/__init__.py -- June 16, 2013 - 22:59

Author: bugman
Date: Sun Jun 16 22:59:35 2013
New Revision: 20168

URL: http://svn.gna.org/viewcvs/relax?rev=20168&view=rev
Log:
Merged revisions 20167 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20167 | bugman | 2013-06-16 22:51:52 +0200 (Sun, 16 Jun 2013) | 6 lines
  
  Shifted the user function initalisation.
  
  This is from the import of the user_functions package to the package 
initialise() function.  This is
  for saner importing dependencies in the relax sources.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/relax.py
    branches/relax_disp/user_functions/__init__.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jun 16 22:59:35 2013
@@ -1,1 +1,1 @@
-/trunk:1-20164
+/trunk:1-20167

Modified: branches/relax_disp/relax.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/relax.py?rev=20168&r1=20167&r2=20168&view=diff
==============================================================================
--- branches/relax_disp/relax.py (original)
+++ branches/relax_disp/relax.py Sun Jun 16 22:59:35 2013
@@ -58,7 +58,12 @@
 from multi import Application_callback, load_multiprocessor
 from prompt import interpreter
 from status import Status; status = Status()
+import user_functions
 import version
+
+
+# Set up the user functions.
+user_functions.initialise()
 
 # Modify the environmental variables.
 putenv('PDBVIEWER', 'vmd')

Modified: branches/relax_disp/user_functions/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/__init__.py?rev=20168&r1=20167&r2=20168&view=diff
==============================================================================
--- branches/relax_disp/user_functions/__init__.py (original)
+++ branches/relax_disp/user_functions/__init__.py Sun Jun 16 22:59:35 2013
@@ -83,58 +83,62 @@
     'vmd'
 ]
 
-# Import all the modules to set up the data.
-import user_functions.align_tensor
-import user_functions.angles
-import user_functions.bmrb
-import user_functions.bruker
-import user_functions.consistency_tests
-import user_functions.dasha
-import user_functions.deselect
-import user_functions.diffusion_tensor
-import user_functions.domain
-import user_functions.dx
-import user_functions.eliminate
-import user_functions.fix
-import user_functions.frame_order
-import user_functions.grace
-import user_functions.interatom
-import user_functions.j_coupling
-import user_functions.jw_mapping
-import user_functions.minimisation
-import user_functions.model_free
-import user_functions.model_selection
-import user_functions.molecule
-import user_functions.molmol
-import user_functions.monte_carlo
-import user_functions.n_state_model
-import user_functions.noe
-import user_functions.palmer
-import user_functions.paramag
-import user_functions.pcs
-import user_functions.pipe
-import user_functions.pymol_control
-import user_functions.rdc
-import user_functions.relax_data
-import user_functions.relax_disp
-import user_functions.relax_fit
-import user_functions.residue
-import user_functions.reset
-import user_functions.results
-import user_functions.script
-import user_functions.select
-import user_functions.sequence
-import user_functions.spectrometer
-import user_functions.spectrum
-import user_functions.spin
-import user_functions.state
-import user_functions.structure
-import user_functions.sys_info
-import user_functions.value
-import user_functions.vmd
 
-# Import the data structure.
-from user_functions.data import Uf_info; uf_info = Uf_info()
+def initialise():
+    """Initialise all of the user function definitions by importing then 
validating them."""
 
-# Check the validity of the data.
-uf_info.validate()
+    # Import all the modules to set up the data.
+    import user_functions.align_tensor
+    import user_functions.angles
+    import user_functions.bmrb
+    import user_functions.bruker
+    import user_functions.consistency_tests
+    import user_functions.dasha
+    import user_functions.deselect
+    import user_functions.diffusion_tensor
+    import user_functions.domain
+    import user_functions.dx
+    import user_functions.eliminate
+    import user_functions.fix
+    import user_functions.frame_order
+    import user_functions.grace
+    import user_functions.interatom
+    import user_functions.j_coupling
+    import user_functions.jw_mapping
+    import user_functions.minimisation
+    import user_functions.model_free
+    import user_functions.model_selection
+    import user_functions.molecule
+    import user_functions.molmol
+    import user_functions.monte_carlo
+    import user_functions.n_state_model
+    import user_functions.noe
+    import user_functions.palmer
+    import user_functions.paramag
+    import user_functions.pcs
+    import user_functions.pipe
+    import user_functions.pymol_control
+    import user_functions.rdc
+    import user_functions.relax_data
+    import user_functions.relax_disp
+    import user_functions.relax_fit
+    import user_functions.residue
+    import user_functions.reset
+    import user_functions.results
+    import user_functions.script
+    import user_functions.select
+    import user_functions.sequence
+    import user_functions.spectrometer
+    import user_functions.spectrum
+    import user_functions.spin
+    import user_functions.state
+    import user_functions.structure
+    import user_functions.sys_info
+    import user_functions.value
+    import user_functions.vmd
+
+    # Import the data structure.
+    from user_functions.data import Uf_info; uf_info = Uf_info()
+
+    # Check the validity of the data.
+    uf_info.validate()