r10874 - /branches/bmrb/specific_fns/model_free/bmrb.py -- February 23, 2010 - 21:56

Author: bugman
Date: Tue Feb 23 21:56:34 2010
New Revision: 10874

URL: http://svn.gna.org/viewcvs/relax?rev=10874&view=rev
Log:
relax now can start without the presence of the bmrblib package 
(http://gna.org/projects/bmrblib/).


Modified:
    branches/bmrb/specific_fns/model_free/bmrb.py

Modified: branches/bmrb/specific_fns/model_free/bmrb.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/specific_fns/model_free/bmrb.py?rev=10874&r1=10873&r2=10874&view=diff
==============================================================================
--- branches/bmrb/specific_fns/model_free/bmrb.py (original)
+++ branches/bmrb/specific_fns/model_free/bmrb.py Tue Feb 23 21:56:34 2010
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2009 Edward d'Auvergne                                       
 #
+# Copyright (C) 2009-2010 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -20,15 +20,19 @@
 #                                                                            
 #
 
###############################################################################
 
+# Dependency check module.
+import dep_check
+
 # Python module imports.
 from math import pi
 from numpy import int32, zeros
 import string
 
 # relax module imports.
-from bmrblib.nmr_star_dict import NMR_STAR
-from bmrblib.nmr_star_dict_v3_1 import NMR_STAR_v3_1
-from bmrblib.nmr_star_dict_v3_2 import NMR_STAR_v3_2
+if dep_check.bmrblib_module:
+    from bmrblib.nmr_star_dict import NMR_STAR
+    from bmrblib.nmr_star_dict_v3_1 import NMR_STAR_v3_1
+    from bmrblib.nmr_star_dict_v3_2 import NMR_STAR_v3_2
 from generic_fns import exp_info, mol_res_spin, pipes, relax_data
 from generic_fns.mol_res_spin import get_molecule_names, spin_loop
 from relax_errors import RelaxError