Author: bugman
Date: Thu Mar 27 19:21:40 2014
New Revision: 22570
URL: http://svn.gna.org/viewcvs/relax?rev=22570&view=rev
Log:
Updates for the rest of relax for the redesign of the
specific_analyses.jw_mapping package.
Modified:
trunk/specific_analyses/setup.py
trunk/user_functions/grace.py
trunk/user_functions/jw_mapping.py
trunk/user_functions/value.py
Modified: trunk/specific_analyses/setup.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/setup.py?rev=22570&r1=22569&r2=22570&view=diff
==============================================================================
--- trunk/specific_analyses/setup.py (original)
+++ trunk/specific_analyses/setup.py Thu Mar 27 19:21:40 2014
@@ -28,7 +28,7 @@
from specific_analyses.consistency_tests import Consistency_tests
from specific_analyses.frame_order import Frame_order
from specific_analyses.hybrid import Hybrid
-from specific_analyses.jw_mapping import Jw_mapping
+from specific_analyses.jw_mapping.api import Jw_mapping
from specific_analyses.model_free import Model_free
from specific_analyses.n_state_model import N_state_model
from specific_analyses.noe.api import Noe
Modified: trunk/user_functions/grace.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/grace.py?rev=22570&r1=22569&r2=22570&view=diff
==============================================================================
--- trunk/user_functions/grace.py (original)
+++ trunk/user_functions/grace.py Thu Mar 27 19:21:40 2014
@@ -35,7 +35,7 @@
from pipe_control import grace, minimise
from prompt.doc_string import regexp_doc
from specific_analyses.consistency_tests import Consistency_tests
-from specific_analyses.jw_mapping import Jw_mapping
+from specific_analyses.jw_mapping import uf as jw_mapping_uf
from specific_analyses.model_free import Model_free
from specific_analyses.noe.api import Noe
from specific_analyses.relax_disp.api import Relax_disp
@@ -195,7 +195,7 @@
uf.desc.append(Noe.return_data_name_doc)
uf.desc.append(Relax_disp.return_data_name_doc)
uf.desc.append(Relax_fit.return_data_name_doc)
-uf.desc.append(Jw_mapping.return_data_name_doc)
+uf.desc.append(jw_mapping_uf.return_data_name_doc)
uf.desc.append(Consistency_tests.return_data_name_doc)
uf.desc.append(Model_free.return_data_name_doc)
# Prompt examples.
Modified: trunk/user_functions/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/jw_mapping.py?rev=22570&r1=22569&r2=22570&view=diff
==============================================================================
--- trunk/user_functions/jw_mapping.py (original)
+++ trunk/user_functions/jw_mapping.py Thu Mar 27 19:21:40 2014
@@ -24,7 +24,7 @@
# relax module imports.
from pipe_control import spectrometer
-from specific_analyses.setup import jw_mapping_obj
+from specific_analyses.jw_mapping.uf import set_frq
from user_functions.data import Uf_info; uf_info = Uf_info()
from user_functions.objects import Desc_container
@@ -56,7 +56,7 @@
uf.desc.append(Desc_container("Prompt examples"))
uf.desc[-1].add_prompt("relax> jw_mapping.set_frq(600.0 * 1e6)")
uf.desc[-1].add_prompt("relax> jw_mapping.set_frq(frq=600.0 * 1e6)")
-uf.backend = jw_mapping_obj._set_frq
+uf.backend = set_frq
uf.menu_text = "&set_frq"
uf.gui_icon = "relax.frq"
uf.wizard_height_desc = 350
Modified: trunk/user_functions/value.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/value.py?rev=22570&r1=22569&r2=22570&view=diff
==============================================================================
--- trunk/user_functions/value.py (original)
+++ trunk/user_functions/value.py Thu Mar 27 19:21:40 2014
@@ -36,7 +36,7 @@
from pipe_control import diffusion_tensor, pipes, value
from prompt.doc_string import regexp_doc
from specific_analyses.consistency_tests import Consistency_tests
-from specific_analyses.jw_mapping import Jw_mapping
+from specific_analyses.jw_mapping import uf as jw_mapping_uf
from specific_analyses.model_free import Model_free
from specific_analyses.relax_fit import Relax_fit
from specific_analyses.n_state_model import N_state_model
@@ -92,8 +92,8 @@
uf.desc.append(regexp_doc)
uf.desc.append(Model_free.set_doc)
uf.desc.append(Model_free.return_data_name_doc)
-uf.desc.append(Jw_mapping.set_doc)
-uf.desc.append(Jw_mapping.return_data_name_doc)
+uf.desc.append(jw_mapping_uf.set_doc)
+uf.desc.append(jw_mapping_uf.return_data_name_doc)
uf.desc.append(Consistency_tests.set_doc)
uf.desc.append(Consistency_tests.return_data_name_doc)
uf.desc.append(Relax_fit.set_doc)
@@ -140,7 +140,7 @@
uf.desc.append(regexp_doc)
uf.desc.append(Model_free.return_data_name_doc)
uf.desc.append(Model_free.write_doc)
-uf.desc.append(Jw_mapping.return_data_name_doc)
+uf.desc.append(jw_mapping_uf.return_data_name_doc)
uf.desc.append(Consistency_tests.return_data_name_doc)
uf.desc.append(Noe.return_data_name_doc)
uf.desc.append(Relax_fit.return_data_name_doc)
@@ -283,8 +283,8 @@
uf.desc.append(regexp_doc)
uf.desc.append(Model_free.set_doc)
uf.desc.append(Model_free.return_data_name_doc)
-uf.desc.append(Jw_mapping.set_doc)
-uf.desc.append(Jw_mapping.return_data_name_doc)
+uf.desc.append(jw_mapping_uf.set_doc)
+uf.desc.append(jw_mapping_uf.return_data_name_doc)
uf.desc.append(Consistency_tests.set_doc)
uf.desc.append(Consistency_tests.return_data_name_doc)
uf.desc.append(Relax_fit.set_doc)
@@ -369,9 +369,9 @@
uf.desc.append(diffusion_tensor.__set_doc__)
uf.desc.append(diffusion_tensor.__return_data_name_doc__)
uf.desc.append(diffusion_tensor.__default_value_doc__)
-uf.desc.append(Jw_mapping.set_doc)
-uf.desc.append(Jw_mapping.return_data_name_doc)
-uf.desc.append(Jw_mapping.default_value_doc)
+uf.desc.append(jw_mapping_uf.set_doc)
+uf.desc.append(jw_mapping_uf.return_data_name_doc)
+uf.desc.append(jw_mapping_uf.default_value_doc)
uf.desc.append(Consistency_tests.set_doc)
uf.desc.append(Consistency_tests.return_data_name_doc)
uf.desc.append(Consistency_tests.default_value_doc)
@@ -478,7 +478,7 @@
uf.desc.append(regexp_doc)
uf.desc.append(Model_free.return_data_name_doc)
uf.desc.append(Model_free.write_doc)
-uf.desc.append(Jw_mapping.return_data_name_doc)
+uf.desc.append(jw_mapping_uf.return_data_name_doc)
uf.desc.append(Consistency_tests.return_data_name_doc)
uf.desc.append(Noe.return_data_name_doc)
uf.desc.append(Relax_fit.return_data_name_doc)
r22570 - in /trunk: specific_analyses/setup.py user_functions/grace.py user_functions/jw_mapping.py user_functions/value.py