Author: bugman
Date: Fri Jul 4 00:09:05 2008
New Revision: 6641
URL: http://svn.gna.org/viewcvs/relax?rev=6641&view=rev
Log:
Renamed determine_param_set_type() to determine_model_type().
Modified:
1.3/generic_fns/dasha.py
1.3/specific_fns/model_free/main.py
1.3/specific_fns/model_free/mf_minimise.py
1.3/specific_fns/model_free/results.py
Modified: 1.3/generic_fns/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/dasha.py?rev=6641&r1=6640&r2=6641&view=diff
==============================================================================
--- 1.3/generic_fns/dasha.py (original)
+++ 1.3/generic_fns/dasha.py Fri Jul 4 00:09:05 2008
@@ -59,7 +59,7 @@
raise RelaxNoSequenceError, self.run
# Determine the parameter set.
- self.param_set =
self.relax.specific.model_free.determine_param_set_type(self.run)
+ self.param_set =
self.relax.specific.model_free.determine_model_type(self.run)
# Test if diffusion tensor data for the run exists.
if self.param_set != 'local_tm' and not ds.diff.has_key(self.run):
Modified: 1.3/specific_fns/model_free/main.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=6641&r1=6640&r2=6641&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Fri Jul 4 00:09:05 2008
@@ -178,7 +178,7 @@
# Determine the model type.
if not model_type:
- model_type = self.determine_param_set_type()
+ model_type = self.determine_model_type()
# Alias the current data pipe.
cdp = ds[ds.current_pipe]
@@ -873,7 +873,7 @@
self.relax.generic.runs.eliminate_unused_runs()
- def determine_param_set_type(self):
+ def determine_model_type(self):
"""Determine the type of parameter set.
@return: The name of the parameter set, which is one of 'all',
'diff', 'mf', or
@@ -998,7 +998,7 @@
setattr(ds[pipe_to], data_name, deepcopy(data_from))
# Determine the parameter set type.
- param_set = self.determine_param_set_type()
+ param_set = self.determine_model_type()
# Sequence specific data.
if param_set == 'mf' or (param_set == 'local_tm' and not
global_stats):
@@ -1097,7 +1097,7 @@
"""
# Determine the parameter set type.
- model_type = self.determine_param_set_type()
+ model_type = self.determine_model_type()
# Get the spin ids.
if model_type == 'mf' or model_type == 'local_tm':
@@ -1131,7 +1131,7 @@
raise RelaxNoModelError, self.run
# Determine the parameter set type.
- self.param_set = self.determine_param_set_type()
+ self.param_set = self.determine_model_type()
# Residue index.
if self.param_set == 'mf' or self.param_set == 'local_tm':
@@ -1620,7 +1620,7 @@
break
# Determine the parameter set type.
- param_set = self.determine_param_set_type()
+ param_set = self.determine_model_type()
# Statistics for a single residue.
if not global_stats:
@@ -1694,7 +1694,7 @@
return 0
# Determine the parameter set type.
- param_set = self.determine_param_set_type()
+ param_set = self.determine_model_type()
# Sequence specific data.
if param_set == 'mf' or param_set == 'local_tm':
@@ -2559,7 +2559,7 @@
"""
# Determine the parameter set type.
- param_set = self.determine_param_set_type()
+ param_set = self.determine_model_type()
# Single instance.
if param_set == 'all' or param_set == 'diff':
@@ -2604,7 +2604,7 @@
self.run = run
# Determine the parameter set type.
- self.param_set = self.determine_param_set_type()
+ self.param_set = self.determine_model_type()
# Get the parameter object names.
param_names = self.data_names(set='params')
@@ -2772,7 +2772,7 @@
self.run = run
# Determine the parameter set type.
- self.param_set = self.determine_param_set_type()
+ self.param_set = self.determine_model_type()
# Single instance.
if self.param_set == 'all' or self.param_set == 'diff':
@@ -2889,7 +2889,7 @@
self.run = run
# Determine the parameter set type.
- self.param_set = self.determine_param_set_type()
+ self.param_set = self.determine_model_type()
# Single instance.
if self.param_set == 'all' or self.param_set == 'diff':
@@ -2912,7 +2912,7 @@
"""
# Determine the parameter set type.
- param_set = self.determine_param_set_type()
+ param_set = self.determine_model_type()
# All spins.
combine = False
@@ -2934,7 +2934,7 @@
self.run = run
# Determine the parameter set type.
- self.param_set = self.determine_param_set_type()
+ self.param_set = self.determine_model_type()
# Simulation deselect.
if sim_index != None:
Modified: 1.3/specific_fns/model_free/mf_minimise.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/mf_minimise.py?rev=6641&r1=6640&r2=6641&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Fri Jul 4 00:09:05 2008
@@ -84,7 +84,7 @@
cdp = ds[ds.current_pipe]
# Determine the parameter set type.
- param_set = self.determine_param_set_type()
+ param_set = self.determine_model_type()
# Test if diffusion tensor data exists.
if param_set != 'local_tm' and not diff_data_exists():
@@ -525,7 +525,7 @@
m = 0
# Determine the parameter set type.
- param_set = self.determine_param_set_type()
+ param_set = self.determine_model_type()
# Alias the current data pipe.
cdp = ds[ds.current_pipe]
@@ -784,7 +784,7 @@
raise RelaxProtonTypeError
# Determine the parameter set type.
- param_set = self.determine_param_set_type()
+ param_set = self.determine_model_type()
# Parameter set for the back-calculate function.
if min_algor == 'back_calc' and param_set != 'local_tm':
Modified: 1.3/specific_fns/model_free/results.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/results.py?rev=6641&r1=6640&r2=6641&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/results.py (original)
+++ 1.3/specific_fns/model_free/results.py Fri Jul 4 00:09:05 2008
@@ -1166,7 +1166,7 @@
self.run = run
# Determine the parameter set type.
- self.param_set = self.determine_param_set_type()
+ self.param_set = self.determine_model_type()
# Header.
r6641 - in /1.3: generic_fns/ specific_fns/model_free/