r19872 - in /branches/relax_disp: ./ specific_analyses/api_common.py -- June 05, 2013 - 18:29

Author: bugman
Date: Wed Jun  5 18:29:58 2013
New Revision: 19872

URL: http://svn.gna.org/viewcvs/relax?rev=19872&view=rev
Log:
Merged revisions 19871 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r19871 | bugman | 2013-06-05 18:26:11 +0200 (Wed, 05 Jun 2013) | 7 lines
  
  Added two methods to the specific analysis common API class.
  
  These are the _model_type_global() and _model_type_local() methods for 
always specifying that the
  model type is global (i.e. at the level of the data pipe) or local (i.e. 
there can be multiple
  clusters of models).
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/specific_analyses/api_common.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun  5 18:29:58 2013
@@ -1,1 +1,1 @@
-/trunk:1-19857
+/trunk:1-19871

Modified: branches/relax_disp/specific_analyses/api_common.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/api_common.py?rev=19872&r1=19871&r2=19872&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/api_common.py (original)
+++ branches/relax_disp/specific_analyses/api_common.py Wed Jun  5 18:29:58 
2013
@@ -221,6 +221,28 @@
         yield 0
 
 
+    def _model_type_global(self):
+        """Return the type of the model as being 'global'.
+
+        @return:            The model type of 'global'.
+        @rtype:             str
+        """
+
+        # Global models.
+        return 'global'
+
+
+    def _model_type_local(self):
+        """Return the type of the model as being 'local'.
+
+        @return:            The model type of 'local'.
+        @rtype:             str
+        """
+
+        # Local models.
+        return 'local'
+
+
     def _num_instances_spin(self):
         """Return the number of instances, equal to the number of selected 
spins.