r12516 - in /branches/bmrb: generic_fns/relax_data.py specific_fns/model_free/bmrb.py -- February 07, 2011 - 15:17

Author: bugman
Date: Mon Feb  7 15:17:28 2011
New Revision: 12516

URL: http://svn.gna.org/viewcvs/relax?rev=12516&view=rev
Log:
Fix for the sample label matching - this is only performed if the sample 
label is given.


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

Modified: branches/bmrb/generic_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/relax_data.py?rev=12516&r1=12515&r2=12516&view=diff
==============================================================================
--- branches/bmrb/generic_fns/relax_data.py (original)
+++ branches/bmrb/generic_fns/relax_data.py Mon Feb  7 15:17:28 2011
@@ -248,7 +248,7 @@
         keys = data.keys()
 
         # Sample conditions do not match (remove the $ sign).
-        if 'sample_cond_list_label' in keys and 
string.replace(data['sample_cond_list_label'], '$', '') != sample_conditions:
+        if 'sample_cond_list_label' in keys and sample_conditions and 
string.replace(data['sample_cond_list_label'], '$', '') != sample_conditions:
             continue
 
         # Create the labels.

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=12516&r1=12515&r2=12516&view=diff
==============================================================================
--- branches/bmrb/specific_fns/model_free/bmrb.py (original)
+++ branches/bmrb/specific_fns/model_free/bmrb.py Mon Feb  7 15:17:28 2011
@@ -131,7 +131,7 @@
             keys = data.keys()
 
             # Sample conditions do not match (remove the $ sign).
-            if 'sample_cond_list_label' in keys and 
string.replace(data['sample_cond_list_label'], '$', '') != sample_conditions:
+            if 'sample_cond_list_label' in keys and sample_conditions and 
string.replace(data['sample_cond_list_label'], '$', '') != sample_conditions:
                 continue
 
             # Global data.