Author: michaelbieri
Date: Wed Jul 28 06:31:25 2010
New Revision: 11369
URL: http://svn.gna.org/viewcvs/relax?rev=11369&view=rev
Log:
Merged revisions 11366-11368 via svnmerge from
svn+ssh://michaelbieri@xxxxxxxxxxx/svn/relax/1.3
........
r11366 | bugman | 2010-07-27 18:14:12 +1000 (Tue, 27 Jul 2010) | 3 lines
The select.read() and deselect.read() user functions can now accept file
handles or dummy file objects.
........
r11367 | bugman | 2010-07-27 22:00:43 +1000 (Tue, 27 Jul 2010) | 3 lines
When loading save states, data pipe names are always converted to a string
to avoid unicode problems.
........
r11368 | bugman | 2010-07-27 23:13:12 +1000 (Tue, 27 Jul 2010) | 6 lines
The loading of RDCs and PCSs for non-existent spins now only throws a
RelaxWarning.
Rather than throwing a RelaxError, this allows for partial loading of
alignment data for certain
regions of the molecule.
........
Modified:
branches/bieri_gui/ (props changed)
branches/bieri_gui/data/__init__.py
branches/bieri_gui/generic_fns/pcs.py
branches/bieri_gui/generic_fns/rdc.py
branches/bieri_gui/prompt/deselect.py
branches/bieri_gui/prompt/select.py
Propchange: branches/bieri_gui/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 28 06:31:25 2010
@@ -1,1 +1,1 @@
-/1.3:1-11341
+/1.3:1-11368
Modified: branches/bieri_gui/data/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/data/__init__.py?rev=11369&r1=11368&r2=11369&view=diff
==============================================================================
--- branches/bieri_gui/data/__init__.py (original)
+++ branches/bieri_gui/data/__init__.py Wed Jul 28 06:31:25 2010
@@ -282,7 +282,7 @@
# Checks.
for pipe_node in pipe_nodes:
# The pipe name and type.
- pipe_name = pipe_node.getAttribute('name')
+ pipe_name = str(pipe_node.getAttribute('name'))
pipe_type = pipe_node.getAttribute('type')
# Existence check.
@@ -296,7 +296,7 @@
# Load the data pipes.
for pipe_node in pipe_nodes:
# The pipe name and type.
- pipe_name = pipe_node.getAttribute('name')
+ pipe_name = str(pipe_node.getAttribute('name'))
pipe_type = pipe_node.getAttribute('type')
# Add the data pipe.
Modified: branches/bieri_gui/generic_fns/pcs.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/pcs.py?rev=11369&r1=11368&r2=11369&view=diff
==============================================================================
--- branches/bieri_gui/generic_fns/pcs.py (original)
+++ branches/bieri_gui/generic_fns/pcs.py Wed Jul 28 06:31:25 2010
@@ -36,9 +36,9 @@
from generic_fns.mol_res_spin import exists_mol_res_spin_data, return_spin,
spin_loop
from maths_fns.pcs import ave_pcs_tensor
from physical_constants import g1H, pcs_constant
-from relax_errors import RelaxError, RelaxNoPdbError, RelaxNoSequenceError,
RelaxNoSpinError
+from relax_errors import RelaxError, RelaxNoPdbError, RelaxNoSequenceError
from relax_io import open_write_file, read_spin_data, write_spin_data
-from relax_warnings import RelaxWarning
+from relax_warnings import RelaxWarning, RelaxNoSpinWarning
def back_calc(align_id=None):
@@ -444,7 +444,8 @@
# Get the corresponding spin container.
spin = return_spin([id, spin_id])
if spin == None:
- raise RelaxNoSpinError(id)
+ warn(RelaxNoSpinWarning(id))
+ continue
# Add the data.
if data_col:
Modified: branches/bieri_gui/generic_fns/rdc.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/rdc.py?rev=11369&r1=11368&r2=11369&view=diff
==============================================================================
--- branches/bieri_gui/generic_fns/rdc.py (original)
+++ branches/bieri_gui/generic_fns/rdc.py Wed Jul 28 06:31:25 2010
@@ -36,9 +36,9 @@
from generic_fns.mol_res_spin import exists_mol_res_spin_data, return_spin,
spin_loop
from maths_fns.rdc import ave_rdc_tensor
from physical_constants import dipolar_constant, return_gyromagnetic_ratio
-from relax_errors import RelaxError, RelaxNoRDCError, RelaxNoSequenceError,
RelaxNoSpinError, RelaxSpinTypeError
+from relax_errors import RelaxError, RelaxNoRDCError, RelaxNoSequenceError,
RelaxSpinTypeError
from relax_io import open_write_file, read_spin_data, write_spin_data
-from relax_warnings import RelaxWarning
+from relax_warnings import RelaxWarning, RelaxNoSpinWarning
def back_calc(align_id=None):
@@ -398,7 +398,8 @@
# Get the corresponding spin container.
spin = return_spin([id, spin_id])
if spin == None:
- raise RelaxNoSpinError(id)
+ warn(RelaxNoSpinWarning(id))
+ continue
# Add the data.
if data_col:
Modified: branches/bieri_gui/prompt/deselect.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/deselect.py?rev=11369&r1=11368&r2=11369&view=diff
==============================================================================
--- branches/bieri_gui/prompt/deselect.py (original)
+++ branches/bieri_gui/prompt/deselect.py Wed Jul 28 06:31:25 2010
@@ -143,7 +143,7 @@
print(text)
# The argument checks.
- arg_check.is_str(file, 'file name')
+ arg_check.is_str_or_inst(file, 'file name')
arg_check.is_str(dir, 'directory name', can_be_none=True)
arg_check.is_int(spin_id_col, 'spin ID string column',
can_be_none=True)
arg_check.is_int(mol_name_col, 'molecule name column',
can_be_none=True)
Modified: branches/bieri_gui/prompt/select.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/select.py?rev=11369&r1=11368&r2=11369&view=diff
==============================================================================
--- branches/bieri_gui/prompt/select.py (original)
+++ branches/bieri_gui/prompt/select.py Wed Jul 28 06:31:25 2010
@@ -172,7 +172,7 @@
print(text)
# The argument checks.
- arg_check.is_str(file, 'file name')
+ arg_check.is_str_or_inst(file, 'file name')
arg_check.is_str(dir, 'directory name', can_be_none=True)
arg_check.is_int(spin_id_col, 'spin ID string column',
can_be_none=True)
arg_check.is_int(mol_name_col, 'molecule name column',
can_be_none=True)
r11369 - in /branches/bieri_gui: ./ data/__init__.py generic_fns/pcs.py generic_fns/rdc.py prompt/deselect.py prompt/select.py