r18835 - /branches/frame_order_testing/specific_fns/frame_order.py -- March 15, 2013 - 17:28

Author: bugman
Date: Fri Mar 15 17:28:24 2013
New Revision: 18835

URL: http://svn.gna.org/viewcvs/relax?rev=18835&view=rev
Log:
Modifications to the frame_order.pdb_model user function backend.


Modified:
    branches/frame_order_testing/specific_fns/frame_order.py

Modified: branches/frame_order_testing/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/frame_order.py?rev=18835&r1=18834&r2=18835&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/frame_order.py (original)
+++ branches/frame_order_testing/specific_fns/frame_order.py Fri Mar 15 
17:28:24 2013
@@ -975,7 +975,7 @@
         return num
 
 
-    def _pdb_model(self, file=None, dir=None, size=30.0, inc=36, 
force=False):
+    def _pdb_model(self, file=None, dist_file=None, dir=None, size=30.0, 
inc=36, force=False, neg_cone=True):
         """Create a PDB file containing a geometric object representing the 
Frame Order cone models.
 
         @keyword file:      The name of the file of the PDB representation 
of the frame order dynamics to create.
@@ -990,18 +990,12 @@
         @type inc:          int
         @keyword force:     Flag which if set to True will cause any 
pre-existing file to be overwritten.
         @type force:        bool
+        @keyword neg_cone:  A flag which if True will cause the negative 
cone to be added to the representation.
+        @type neg_cone:     bool
         """
 
         # Test if the current data pipe exists.
         pipes.test()
-
-        # The rigid model cannot be used here.
-        if cdp.model == 'rigid':
-            raise RelaxError("The 'rigid' frame order model has no cone 
representation.")
-
-        # Test for the necessary data structures.
-        if not hasattr(cdp, 'pivot'):
-            raise RelaxError("The pivot point for the domain motion has not 
been set.")
 
         # Negative cone flag.
         neg_cone = True