r5029 - /branches/N_state_model/prompt/n_state_model.py -- February 19, 2008 - 17:22

Author: bugman
Date: Tue Feb 19 17:22:35 2008
New Revision: 5029

URL: http://svn.gna.org/viewcvs/relax?rev=5029&view=rev
Log:
Fixes for the n_state_model.cone_pdb() user function for the cone_type arg.


Modified:
    branches/N_state_model/prompt/n_state_model.py

Modified: branches/N_state_model/prompt/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/n_state_model.py?rev=5029&r1=5028&r2=5029&view=diff
==============================================================================
--- branches/N_state_model/prompt/n_state_model.py (original)
+++ branches/N_state_model/prompt/n_state_model.py Tue Feb 19 17:22:35 2008
@@ -116,7 +116,7 @@
         n_state_model_obj.CoM(pivot_point=pivot_point, centre=centre)
 
 
-    def cone_pdb(self, scale=1.8e-6, cone_type=None, file='cone.pdb', 
dir=None, force=False):
+    def cone_pdb(self, cone_type=None, scale=1.0, file='cone.pdb', dir=None, 
force=False):
         """Create a PDB file to represent the diffusion tensor.
 
         Keyword Arguments
@@ -214,12 +214,17 @@
         # Function intro text.
         if self.__relax__.interpreter.intro:
             text = sys.ps3 + "n_state_model.cone_pdb("
-            text = text + "scale=" + `scale`
+            text = text + "cone_type=" + `cone_type`
+            text = text + ", scale=" + `scale`
             text = text + ", file=" + `file`
             text = text + ", dir=" + `dir`
             text = text + ", force=" + `force` + ")"
             print text
 
+        # Cone type.
+        if type(cone_type) != str:
+            raise RelaxStrError, ('cone type', cone_type)
+
         # Scaling.
         if type(scale) != float and type(scale) != int:
             raise RelaxNumError, ('scaling factor', scale)
@@ -237,7 +242,7 @@
             raise RelaxBoolError, ('force flag', force)
 
         # Execute the functional code.
-        n_state_model.cone_pdb(scale=scale, file=file, dir=dir, force=force)
+        n_state_model.cone_pdb(cone_type=cone_type, scale=scale, file=file, 
dir=dir, force=force)
 
 
     def model(self, N=None, ref=None):