Author: semor
Date: Wed Jul 30 21:10:06 2008
New Revision: 7036
URL: http://svn.gna.org/viewcvs/relax?rev=7036&view=rev
Log:
Other conversions to the new design.
Removal of run arguments and introduction of the exists_mol_res_spin_data()
function.
Modified:
1.3/generic_fns/dasha.py
1.3/generic_fns/relax_data.py
1.3/generic_fns/value.py
1.3/specific_fns/noe.py
Modified: 1.3/generic_fns/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/dasha.py?rev=7036&r1=7035&r2=7036&view=diff
==============================================================================
--- 1.3/generic_fns/dasha.py (original)
+++ 1.3/generic_fns/dasha.py Wed Jul 30 21:10:06 2008
@@ -57,8 +57,8 @@
raise RelaxNoPipeError
# Test if sequence data is loaded.
- if not ds.res.has_key(self.run):
- raise RelaxNoSequenceError, self.run
+ if not exists_mol_res_spin_data():
+ raise RelaxNoSequenceError
# Determine the parameter set.
model_type =
self.relax.specific.model_free.determine_model_type(self.run)
@@ -389,8 +389,8 @@
"""Function for extracting the Dasha results out of the
'dasha_results' file."""
# Test if sequence data is loaded.
- if not ds.res.has_key(self.run):
- raise RelaxNoSequenceError, self.run
+ if not exists_mol_res_spin_data():
+ raise RelaxNoSequenceError
# The directory.
if dir == None:
Modified: 1.3/generic_fns/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/relax_data.py?rev=7036&r1=7035&r2=7036&view=diff
==============================================================================
--- 1.3/generic_fns/relax_data.py (original)
+++ 1.3/generic_fns/relax_data.py Wed Jul 30 21:10:06 2008
@@ -144,8 +144,8 @@
raise RelaxNoPipeError
# Test if sequence data is loaded.
- if not ds.res.has_key(self.run):
- raise RelaxNoSequenceError, self.run
+ if not exists_mol_res_spin_data():
+ raise RelaxNoSequenceError
# Test if relaxation data corresponding to 'self.ri_label' and
'self.frq_label' already exists.
if self.test_labels():
@@ -412,8 +412,8 @@
raise RelaxNoPipeError
# Test if the sequence data is loaded.
- if not ds.res.has_key(self.run):
- raise RelaxNoSequenceError, self.run
+ if not exists_mol_res_spin_data():
+ raise RelaxNoSequenceError
# Test if data corresponding to 'self.ri_label' and 'self.frq_label'
exists.
if not self.test_labels():
@@ -482,8 +482,8 @@
raise RelaxNoPipeError
# Test if the sequence data is loaded.
- if not ds.res.has_key(self.run):
- raise RelaxNoSequenceError, self.run
+ if not exists_mol_res_spin_data():
+ raise RelaxNoSequenceError
# Test if data corresponding to 'self.ri_label' and 'self.frq_label'
exists.
if not self.test_labels():
@@ -917,8 +917,8 @@
raise RelaxNoPipeError
# Test if the sequence data is loaded.
- if not ds.res.has_key(self.run):
- raise RelaxNoSequenceError, self.run
+ if not exists_mol_res_spin_data():
+ raise RelaxNoSequenceError
# Test if data corresponding to 'self.ri_label' and 'self.frq_label'
exists.
if not self.test_labels():
Modified: 1.3/generic_fns/value.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/value.py?rev=7036&r1=7035&r2=7036&view=diff
==============================================================================
--- 1.3/generic_fns/value.py (original)
+++ 1.3/generic_fns/value.py Wed Jul 30 21:10:06 2008
@@ -387,11 +387,10 @@
self.relax.generic.minimise.reset_min_stats(run2)
- def display(self, run=None, param=None):
+ def display(self, param=None):
"""Function for displaying residue specific data values."""
# Arguments.
- self.run = run
self.param = param
# Test if the current pipe exists.
@@ -399,18 +398,17 @@
raise RelaxNoPipeError
# Test if the sequence data is loaded.
- if not ds.res.has_key(self.run):
- raise RelaxNoSequenceError, self.run
+ if not exists_mol_res_spin_data():
+ raise RelaxNoSequenceError
# Print the data.
self.write_data(sys.stdout)
- def read(self, run=None, param=None, scaling=1.0, file=None, num_col=0,
name_col=1, data_col=2, error_col=3, sep=None):
+ def read(self, param=None, scaling=1.0, file=None, num_col=0,
name_col=1, data_col=2, error_col=3, sep=None):
"""Function for reading residue specific data values from a file."""
# Arguments.
- self.run = run
self.param = param
self.scaling = scaling
@@ -419,8 +417,8 @@
raise RelaxNoPipeError
# Test if sequence data is loaded.
- if not ds.res.has_key(self.run):
- raise RelaxNoSequenceError, self.run
+ if not exists_mol_res_spin_data():
+ raise RelaxNoSequenceError
# Function type.
self.function_type = ds.run_types[ds.run_names.index(self.run)]
@@ -561,11 +559,10 @@
self.relax.generic.minimise.reset_min_stats(self.run)
- def write(self, run=None, param=None, file=None, dir=None, force=False,
return_value=None):
+ def write(self, param=None, file=None, dir=None, force=False,
return_value=None):
"""Function for writing data to a file."""
# Arguments.
- self.run = run
self.param = param
# Test if the current pipe exists.
@@ -573,8 +570,8 @@
raise RelaxNoPipeError
# Test if the sequence data is loaded.
- if not ds.res.has_key(self.run):
- raise RelaxNoSequenceError, self.run
+ if not exists_mol_res_spin_data():
+ raise RelaxNoSequenceError
# Open the file for writing.
file = self.relax.IO.open_write_file(file, dir, force)
Modified: 1.3/specific_fns/noe.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/noe.py?rev=7036&r1=7035&r2=7036&view=diff
==============================================================================
--- 1.3/specific_fns/noe.py (original)
+++ 1.3/specific_fns/noe.py Wed Jul 30 21:10:06 2008
@@ -334,8 +334,8 @@
raise RelaxNoPipeError
# Test if the sequence data is loaded.
- if not ds.res.has_key(run):
- raise RelaxNoSequenceError, run
+ if not exists_mol_res_spin_data():
+ raise RelaxNoSequenceError
# Test if the residue number is a valid regular expression.
if type(res_num) == str:
r7036 - in /1.3: generic_fns/dasha.py generic_fns/relax_data.py generic_fns/value.py specific_fns/noe.py