r22585 - in /trunk: specific_analyses/setup.py user_functions/dx.py -- March 28, 2014 - 12:24

Author: bugman
Date: Fri Mar 28 12:24:58 2014
New Revision: 22585

URL: http://svn.gna.org/viewcvs/relax?rev=22585&view=rev
Log:
Fixes for the new specific_analyses.model_free.api module.


Modified:
    trunk/specific_analyses/setup.py
    trunk/user_functions/dx.py

Modified: trunk/specific_analyses/setup.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/setup.py?rev=22585&r1=22584&r2=22585&view=diff
==============================================================================
--- trunk/specific_analyses/setup.py    (original)
+++ trunk/specific_analyses/setup.py    Fri Mar 28 12:24:58 2014
@@ -29,7 +29,7 @@
 from specific_analyses.frame_order import Frame_order
 from specific_analyses.hybrid import Hybrid
 from specific_analyses.jw_mapping.api import Jw_mapping
-from specific_analyses.model_free import Model_free
+from specific_analyses.model_free.api import Model_free
 from specific_analyses.n_state_model.api import N_state_model
 from specific_analyses.noe.api import Noe
 from specific_analyses.relax_disp.api import Relax_disp

Modified: trunk/user_functions/dx.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/dx.py?rev=22585&r1=22584&r2=22585&view=diff
==============================================================================
--- trunk/user_functions/dx.py  (original)
+++ trunk/user_functions/dx.py  Fri Mar 28 12:24:58 2014
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2003-2013 Edward d'Auvergne                                  
 #
+# Copyright (C) 2003-2014 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -35,7 +35,7 @@
 from pipe_control import diffusion_tensor
 from pipe_control.opendx import map
 from prompt.doc_string import regexp_doc
-from specific_analyses.model_free import Model_free
+from specific_analyses.model_free.api import Model_free
 from user_functions.data import Uf_info; uf_info = Uf_info()
 from user_functions.data import Uf_tables; uf_tables = Uf_tables()
 from user_functions.objects import Desc_container