r25203 - in /branches/frame_order_cleanup: ./ pipe_control/structure/main.py -- August 22, 2014 - 11:29

Author: bugman
Date: Fri Aug 22 11:29:12 2014
New Revision: 25203

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

........
  r25202 | bugman | 2014-08-22 11:28:35 +0200 (Fri, 22 Aug 2014) | 7 lines
  
  Another fix for bug #22505 (https://gna.org/bugs/?22505).
  
  This is the failure of the structure.create_diff_tensor_pdb user function 
when no structural data is
  present.  Now the cdp.structure data structure is checked, when present, if 
it contains any data
  using its own empty() method.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/pipe_control/structure/main.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 22 11:29:12 2014
@@ -1 +1 @@
-/trunk:1-25200
+/trunk:1-25202

Modified: branches/frame_order_cleanup/pipe_control/structure/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/structure/main.py?rev=25203&r1=25202&r2=25203&view=diff
==============================================================================
--- branches/frame_order_cleanup/pipe_control/structure/main.py (original)
+++ branches/frame_order_cleanup/pipe_control/structure/main.py Fri Aug 22 
11:29:12 2014
@@ -152,7 +152,7 @@
     pipes.test()
 
     # Calculate the centre of mass.
-    if hasattr(cdp, 'structure'):
+    if hasattr(cdp, 'structure') and not cdp.structure.empty():
         com = pipe_centre_of_mass()
     else:
         com = zeros(3, float64)