Menu

Commit [r22316]  Maximize  Restore  History

Merged revisions 22301-22315 via svnmerge from

svn+ssh://bugman@.../svn/relax/trunk

........
r22301 | tlinnet | 2014-02-25 15:04:49 +0100 (Tue, 25 Feb 2014) | 9 lines

Added exp_type, frq, offset, point to the loop_time() function.

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis with two fields at two delay times.

Implemented as suggested in: http://www.mail-archive.com/relax-devel@.../msg04993.html
In all these cases, that information is available, so it should be used.
If one are analysing a combination of data types simultaneously (SQ CPMG, DQ CPMG, R1rho), one will not
have the same relaxation time for each. For different spin-lock or 180 degree pulse offsets and even different dispersion points,
the time may also be different.
........
r22302 | tlinnet | 2014-02-25 15:04:51 +0100 (Tue, 25 Feb 2014) | 6 lines

Made count_relax_times() take optional arguments as: exp_type, frq, offset, point.

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis with two fields at two delay times.

This is prepare for re-stricting the looping over time points in the function: loop_time()
This is implemented as suggested in: http://www.mail-archive.com/relax-devel@.../msg04993.html
........
r22303 | tlinnet | 2014-02-25 15:04:53 +0100 (Tue, 25 Feb 2014) | 3 lines

Modified to pass exp_typ, frq, offset or point to loop_time() where such information is available.

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis with two fields at two delay times.
........
r22304 | tlinnet | 2014-02-25 15:04:55 +0100 (Tue, 25 Feb 2014) | 5 lines

Added unit test for count_relax_times.

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis with two fields at two delay times.

This follows the suggestion in: http://www.mail-archive.com/relax-devel@.../msg04993.html.
........
r22305 | tlinnet | 2014-02-25 15:04:56 +0100 (Tue, 25 Feb 2014) | 3 lines

Added test for return of get_curve_type(), to match 'fixed time'.

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis with two fields at two delay times.
........
r22306 | tlinnet | 2014-02-25 15:04:58 +0100 (Tue, 25 Feb 2014) | 3 lines

Added check for return of has_exponential_exp_type to be False.

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis with two fields at two delay times.
........
r22307 | tlinnet | 2014-02-25 15:04:59 +0100 (Tue, 25 Feb 2014) | 3 lines

Added test for the return of get_times().

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis with two fields at two delay times.
........
r22308 | tlinnet | 2014-02-25 15:05:03 +0100 (Tue, 25 Feb 2014) | 3 lines

Re-ordered unit tests for test of get_curve_type() and has_exponential_exp_type().

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis with two fields at two delay times.
........
r22309 | tlinnet | 2014-02-25 15:05:04 +0100 (Tue, 25 Feb 2014) | 3 lines

Added the extraction of exp_type and frq from cdp, to be sent into count_relax_times.

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis with two fields at two delay times.
........
r22310 | tlinnet | 2014-02-25 15:05:06 +0100 (Tue, 25 Feb 2014) | 3 lines

Modified check_exp_type_fixed_time to loop over id's and use count_relax_times for each id.

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis with two fields at two delay times.
........
r22311 | bugman | 2014-02-25 15:42:27 +0100 (Tue, 25 Feb 2014) | 6 lines

The fetch_docstrings.py script now creates a new LaTeX listing language for relax log messages.

This is in the script_definitions() method which creates the script_definition.tex file. The idea
is to avoid colouring relax/Python keywords such as 'as', 'from', etc. in the log messages.
........
r22312 | tlinnet | 2014-02-25 16:39:32 +0100 (Tue, 25 Feb 2014) | 3 lines

Moved the unit test get_times() to its own test.

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis with two fields at two delay times.
........
r22313 | tlinnet | 2014-02-25 16:39:33 +0100 (Tue, 25 Feb 2014) | 3 lines

Moved the unit test of has_exponential_exp_type() to its own test.

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis with two fields at two delay times.
........
r22314 | tlinnet | 2014-02-25 16:39:35 +0100 (Tue, 25 Feb 2014) | 3 lines

Moved the unit test get_curve_type() to its own test.

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis with two fields at two delay times.
........
r22315 | tlinnet | 2014-02-25 16:58:36 +0100 (Tue, 25 Feb 2014) | 3 lines

Added save state for bug 21344.

Regarding bug #21344, (https://gna.org/bugs/index.php?21344) - Handling of in sparse acquired R1rho dataset with missing combinations of time and spin-lock field strengths.
........

bugman 2014-02-25

changed /branches/double_rotor
changed /branches/double_rotor/docs/latex/fetch_docstrings.py
changed /branches/double_rotor/specific_analyses/relax_disp/api.py
changed /branches/double_rotor/specific_analyses/relax_disp/checks.py
changed /branches/double_rotor/specific_analyses/relax_disp/disp_data.py
changed /branches/double_rotor/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
copied /trunk/test_suite/shared_data/dispersion/bug_21344.bz2 -> /branches/double_rotor/test_suite/shared_data/dispersion/bug_21344.bz2
/branches/double_rotor/docs/latex/fetch_docstrings.py Diff Switch to side-by-side view
Loading...
/branches/double_rotor/specific_analyses/relax_disp/api.py Diff Switch to side-by-side view
Loading...
/branches/double_rotor/specific_analyses/relax_disp/checks.py Diff Switch to side-by-side view
Loading...
/branches/double_rotor/specific_analyses/relax_disp/disp_data.py Diff Switch to side-by-side view
Loading...
/branches/double_rotor/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py Diff Switch to side-by-side view
Loading...
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.