Author: semor
Date: Tue Jan 6 21:46:17 2009
New Revision: 8236
URL: http://svn.gna.org/viewcvs/relax?rev=8236&view=rev
Log:
Merged revisions 8226-8227,8230,8234 via svnmerge from
svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.3
........
r8226 | semor | 2009-01-06 13:30:55 -0500 (Tue, 06 Jan 2009) | 3 lines
Corrected a small typo in the development chapter of the manual.
........
r8227 | semor | 2009-01-06 13:50:20 -0500 (Tue, 06 Jan 2009) | 3 lines
Removed an unused import.
........
r8230 | semor | 2009-01-06 15:13:44 -0500 (Tue, 06 Jan 2009) | 3 lines
Removed some unused imports.
........
r8234 | semor | 2009-01-06 15:38:49 -0500 (Tue, 06 Jan 2009) | 3 lines
Removed an unused import.
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/docs/latex/develop.tex
branches/relax_disp/prompt/relax_data.py
branches/relax_disp/specific_fns/relax_fit.py
branches/relax_disp/test_suite/system_tests/relax_fit.py
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 6 21:46:17 2009
@@ -1,1 +1,1 @@
-/1.3:1-8224
+/1.3:1-8235
Modified: branches/relax_disp/docs/latex/develop.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/develop.tex?rev=8236&r1=8235&r2=8236&view=diff
==============================================================================
--- branches/relax_disp/docs/latex/develop.tex (original)
+++ branches/relax_disp/docs/latex/develop.tex Tue Jan 6 21:46:17 2009
@@ -415,7 +415,7 @@
\subsubsection{Branch creation}
\index{repository!branch creation}
-If a change is likely to be disruptive or cause breakages in the program,
the use of your own temporary branch is recommended. This private branch is
a complete copy of one of the main development lines wherein you can make
changes without disrupting the other developers. Although called a private
branch every change is visible to all other developers and each commit will
result in an automatic email to the relax-commits mailing list\index{mailing
list!relax-commits}. Other developers are even able to check out your branch
and make modifications to it. Private branches can also be used for testing
ideas. If the idea does not work the branch can be deleted from the
repository (in reality the branch will always exist between the revision
numbers of its creation and deletion and can always be resurrected). For
example to create a branch from the main 1.2 development line called
\texttt{molmol\_macros} whereby new Molmol macros are to be written, type
+If a change is likely to be disruptive or cause breakages in the program,
the use of your own temporary branch is recommended. This private branch is
a complete copy of one of the main development lines wherein you can make
changes without disrupting the other developers. Although called a private
branch every change is visible to all other developers and each commit will
result in an automatic email to the relax-commits mailing list\index{mailing
list!relax-commits}. Other developers are even able to check out your branch
and make modifications to it. Private branches can also be used for testing
ideas. If the idea does not work the branch can be deleted from the
repository (in reality the branch will always exist between the revision
numbers of its creation and deletion and can always be resurrected). For
example to create a branch from the main 1.3 development line called
\texttt{molmol\_macros} whereby new Molmol macros are to be written, type
\begin{exampleenv}
\$ svn cp svn+ssh://xxxxx@xxxxxxxxxxx/svn/relax/1.3 $\backslash$ \\
Modified: branches/relax_disp/prompt/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/prompt/relax_data.py?rev=8236&r1=8235&r2=8236&view=diff
==============================================================================
--- branches/relax_disp/prompt/relax_data.py (original)
+++ branches/relax_disp/prompt/relax_data.py Tue Jan 6 21:46:17 2009
@@ -30,7 +30,7 @@
# relax module imports.
import help
from generic_fns import relax_data
-from relax_errors import RelaxError, RelaxBoolError, RelaxBinError,
RelaxFloatError, RelaxIntError, RelaxNoneIntError, RelaxNoneStrError,
RelaxStrError
+from relax_errors import RelaxError, RelaxBoolError, RelaxFloatError,
RelaxIntError, RelaxNoneIntError, RelaxNoneStrError, RelaxStrError
class Relax_data:
Modified: branches/relax_disp/specific_fns/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_fns/relax_fit.py?rev=8236&r1=8235&r2=8236&view=diff
==============================================================================
--- branches/relax_disp/specific_fns/relax_fit.py (original)
+++ branches/relax_disp/specific_fns/relax_fit.py Tue Jan 6 21:46:17 2009
@@ -24,17 +24,15 @@
"""The relaxation curve fitting specific code."""
# Python module imports.
-from math import sqrt
from numpy import array, average, dot, float64, identity, zeros
from numpy.linalg import inv
from re import match, search
-import sys
# relax module imports.
from dep_check import C_module_exp_fn
from base_class import Common_functions
from generic_fns import pipes
-from generic_fns.mol_res_spin import count_spins, exists_mol_res_spin_data,
generate_spin_id, return_spin, spin_loop
+from generic_fns.mol_res_spin import exists_mol_res_spin_data,
generate_spin_id, return_spin, spin_loop
from minfx.generic import generic_minimise
from relax_errors import RelaxError, RelaxFuncSetupError, RelaxLenError,
RelaxNoModelError, RelaxNoSequenceError
Modified: branches/relax_disp/test_suite/system_tests/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/relax_fit.py?rev=8236&r1=8235&r2=8236&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_fit.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_fit.py Tue Jan 6
21:46:17 2009
@@ -30,7 +30,7 @@
# relax module imports.
from data import Relax_data_store; ds = Relax_data_store()
-from generic_fns.mol_res_spin import return_spin_from_index, spin_index_loop
+from generic_fns.mol_res_spin import spin_index_loop
from generic_fns import pipes
r8236 - in /branches/relax_disp: ./ docs/latex/ prompt/ specific_fns/ test_suite/system_tests/