Author: bugman Date: Thu Sep 5 16:28:29 2013 New Revision: 20853 URL: http://svn.gna.org/viewcvs/relax?rev=20853&view=rev Log: Fixes for all of the specific_analyses.relax_disp.disp_data.has_*_exp_type() functions. They now operate when no experiment types have been specified. Modified: branches/relax_disp/specific_analyses/relax_disp/disp_data.py Modified: branches/relax_disp/specific_analyses/relax_disp/disp_data.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/disp_data.py?rev=20853&r1=20852&r2=20853&view=diff ============================================================================== --- branches/relax_disp/specific_analyses/relax_disp/disp_data.py (original) +++ branches/relax_disp/specific_analyses/relax_disp/disp_data.py Thu Sep 5 16:28:29 2013 @@ -308,6 +308,10 @@ @rtype: bool """ + # No experiment types set. + if not hasattr(cdp, 'exp_type'): + return False + # Loop over all experiment types. for exp_type in cdp.exp_type_list: if exp_type in EXP_TYPE_LIST_CPMG: @@ -324,6 +328,10 @@ @rtype: bool """ + # No experiment types set. + if not hasattr(cdp, 'exp_type'): + return False + # Loop over all experiment types. for exp_type in cdp.exp_type_list: if exp_type in EXP_TYPE_LIST_VAR_TIME: @@ -340,6 +348,10 @@ @rtype: bool """ + # No experiment types set. + if not hasattr(cdp, 'exp_type'): + return False + # Loop over all experiment types. for exp_type in cdp.exp_type_list: if exp_type in EXP_TYPE_LIST_FIXED_TIME: @@ -355,6 +367,10 @@ @return: True if R1rho experiment types exist, False otherwise. @rtype: bool """ + + # No experiment types set. + if not hasattr(cdp, 'exp_type'): + return False # Loop over all experiment types. for exp_type in cdp.exp_type_list: