Author: bugman
Date: Wed Mar 27 14:03:10 2013
New Revision: 19190
URL: http://svn.gna.org/viewcvs/relax?rev=19190&view=rev
Log:
Ported r from the old relax_disp branch into the new branch.
The commands used were:
svn merge -r8344:8345
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/specific_fns/@r18123
specific_analyses
svn merge -r8344:8345
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/test_suite/@r18123
test_suite
The prompt package changes were manually ported to the user_functions package.
.....
r8345 | semor | 2009-01-08 20:30:41 +0100 (Thu, 08 Jan 2009) | 4 lines
Changed paths:
M /branches/relax_disp/prompt/relax_disp.py
M /branches/relax_disp/specific_fns/relax_disp.py
M
/branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
Corrected remaining frq instances to cpmg_frq when appropriate to avoid
confusion and corrected a
few related things in the system test script.
.....
Modified:
branches/relax_disp/specific_analyses/relax_disp.py
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
branches/relax_disp/user_functions/relax_disp.py
Modified: branches/relax_disp/specific_analyses/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19190&r1=19189&r2=19190&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 14:03:10
2013
@@ -170,11 +170,11 @@
return results[result_index]
- def cpmg_frq(self, frq=0, spectrum_id=None):
+ def cpmg_frq(self, cpmg_frq=0, spectrum_id=None):
"""Set the CPMG frequency associated with a given spectrum.
- @keyword frq: The frequency, in Hz, of the CPMG pulse
train.
- @type frq: int
+ @keyword cpmg_frq: The frequency, in Hz, of the CPMG pulse
train.
+ @type cpmg_frq: int
@keyword spectrum_id: The spectrum identification string.
@type spectrum_id: str
"""
@@ -187,7 +187,7 @@
raise RelaxError, "The peak heights corresponding to spectrum id
'%s' have not been loaded." % spectrum_id
# Store the CPMG frequency in the class instance.
- self.__cpmg_frq = int(frq)
+ self.__cpmg_frq = int(cpmg_frq)
# The index.
index = cdp.spectrum_ids.index(spectrum_id)
@@ -204,7 +204,7 @@
break
# Add the frequency at the correct position.
- cdp.cpmg_frqs[index] = frq
+ cdp.cpmg_frqs[index] = cpmg_frq
def cpmg_delayT(self, id=None, delayT=None):
Modified:
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py?rev=19190&r1=19189&r2=19190&view=diff
==============================================================================
---
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
(original)
+++
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
Wed Mar 27 14:03:10 2013
@@ -27,7 +27,7 @@
relax_disp.cpmg_delayT(id='600', delayT=0.020)
# Relaxation dispersion CPMG frequencies (in Hz).
-relax_disp.cpmg_frq = [
+cpmg_frq = [
0.1936
]
@@ -43,7 +43,7 @@
spectrum.read_intensities(file=names[i]+'.list', dir=data_path,
spectrum_id=names[i], int_method='height')
# Set the relaxation dispersion CPMG frequencies.
- relax_disp.relax_time(frq=frq[i], spectrum_id=names[i])
+ relax_disp.cpmg_frq(cpmg_frq=cpmg_frq[i], spectrum_id=names[i])
# Specify the duplicated spectra.
#spectrum.replicated(spectrum_ids=['T2_ncyc1_ave', 'T2_ncyc1b_ave'])
Modified: branches/relax_disp/user_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/relax_disp.py?rev=19190&r1=19189&r2=19190&view=diff
==============================================================================
--- branches/relax_disp/user_functions/relax_disp.py (original)
+++ branches/relax_disp/user_functions/relax_disp.py Wed Mar 27 14:03:10 2013
@@ -72,9 +72,9 @@
uf.title = "Set the CPMG frequency associated with a given spectrum."
uf.title_short = "CPMG frequency setting."
uf.add_keyarg(
- name = "frq",
+ name = "cpmg_frq",
py_type = "float",
- desc_short = "frequency (Hz)",
+ desc_short = "CPMG frequency (Hz)",
desc = "The frequency, in Hz, of the CPMG pulse train."
)
uf.add_keyarg(
@@ -90,10 +90,10 @@
uf.desc.append(Desc_container("Prompt examples"))
uf.desc[-1].add_paragraph("To identify the reference spectrum called
'reference_spectrum', type one of:")
uf.desc[-1].add_prompt("relax> relax_disp.cpmg_frq(0, 'reference_spectrum')")
-uf.desc[-1].add_prompt("relax> relax_disp.cpmg_frq(frq=0,
spectrum_id='reference_spectrum')")
+uf.desc[-1].add_prompt("relax> relax_disp.cpmg_frq(cpmg_frq=0,
spectrum_id='reference_spectrum')")
uf.desc[-1].add_paragraph("To set a frequency of 200 Hz for the spectrum
'200_Hz_spectrum', type one of:")
uf.desc[-1].add_prompt("relax> relax_disp.cpmg_frq(200, '200_Hz_spectrum')")
-uf.desc[-1].add_prompt("relax> relax_disp.cpmg_frq(frq=200,
spectrum_id='200_Hz_spectrum')")
+uf.desc[-1].add_prompt("relax> relax_disp.cpmg_frq(cpmg_frq=200,
spectrum_id='200_Hz_spectrum')")
uf.backend = relax_disp_obj._cpmg_frq
uf.menu_text = "&cpmg_frq"
uf.wizard_size = (800, 500)
r19190 - in /branches/relax_disp: specific_analyses/ test_suite/system_tests/scripts/ user_functions/