Author: bugman Date: Mon Oct 5 11:51:48 2015 New Revision: 27984 URL: http://svn.gna.org/viewcvs/relax?rev=27984&view=rev Log: Modifications of the test suite script for calculating synthetic CPMG data.
The imports in cpmg_synthetic.py are now all used, rather than being commented out. This allows the find_unused_imports.py devel script to pass. Modified: trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/cpmg_synthetic.py Modified: trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/cpmg_synthetic.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/cpmg_synthetic.py?rev=27984&r1=27983&r2=27984&view=diff ============================================================================== --- trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/cpmg_synthetic.py (original) +++ trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/cpmg_synthetic.py Mon Oct 5 11:51:48 2015 @@ -1,7 +1,7 @@ ############################################################################### # # # Copyright (C) 2013-2014 Troels E. Linnet # -# Copyright (C) 2014 Edward d'Auvergne # +# Copyright (C) 2014-2015 Edward d'Auvergne # # # # This file is part of the program relax (http://www.nmr-relax.com). # # # @@ -46,35 +46,47 @@ ################################################################################## # The dispersion model to test. if not hasattr(ds, 'data'): - ### Take a numerical model to create the data. - ## The "NS CPMG 2-site 3D full" is here the best, since you can define both r2a and r2b. - #model_create = MODEL_NS_CPMG_2SITE_3D - #model_create = MODEL_NS_CPMG_2SITE_3D_FULL - #model_create = MODEL_NS_CPMG_2SITE_STAR - model_create = MODEL_NS_CPMG_2SITE_STAR_FULL - #model_create = MODEL_NS_CPMG_2SITE_EXPANDED - #model_create = MODEL_CR72 - #model_create = MODEL_CR72_FULL - #model_create = MODEL_B14 - #model_create = MODEL_B14_FULL - - ### The select a model to analyse with. - ## Analytical : r2a = r2b - #model_analyse = MODEL_CR72 - #model_analyse = MODEL_IT99 - #model_analyse = MODEL_TSMFK01 - #model_analyse = MODEL_B14 - - ## Analytical full : r2a != r2b - #model_analyse = MODEL_CR72_FULL - #model_analyse = MODEL_B14_FULL - ## NS : r2a = r2b - #model_analyse = MODEL_NS_CPMG_2SITE_3D - #model_analyse = MODEL_NS_CPMG_2SITE_STAR - #model_analyse = MODEL_NS_CPMG_2SITE_EXPANDED - ## NS full : r2a = r2b - #model_analyse = MODEL_NS_CPMG_2SITE_3D_FULL - model_analyse = MODEL_NS_CPMG_2SITE_STAR_FULL + ## Take a numerical model to create the data. + model_create_list = [] + + # The "NS CPMG 2-site 3D full" is here the best, since you can define both r2a and r2b. + model_create_list.append(MODEL_NS_CPMG_2SITE_3D) + model_create_list.append(MODEL_NS_CPMG_2SITE_3D_FULL) + model_create_list.append(MODEL_NS_CPMG_2SITE_STAR) + model_create_list.append(MODEL_NS_CPMG_2SITE_STAR_FULL) + model_create_list.append(MODEL_NS_CPMG_2SITE_EXPANDED) + model_create_list.append(MODEL_CR72) + model_create_list.append(MODEL_CR72_FULL) + model_create_list.append(MODEL_B14) + model_create_list.append(MODEL_B14_FULL) + + # The model. + model_create = model_create_list[3] + + ## The select a model to analyse with. + model_analyse_list = [] + + # Analytical : r2a = r2b + model_analyse_list.append(MODEL_CR72) + model_analyse_list.append(MODEL_IT99) + model_analyse_list.append(MODEL_TSMFK01) + model_analyse_list.append(MODEL_B14) + + # Analytical full : r2a != r2b + model_analyse_list.append(MODEL_CR72_FULL) + model_analyse_list.append(MODEL_B14_FULL) + + # NS : r2a = r2b + model_analyse_list.append(MODEL_NS_CPMG_2SITE_3D) + model_analyse_list.append(MODEL_NS_CPMG_2SITE_STAR) + model_analyse_list.append(MODEL_NS_CPMG_2SITE_EXPANDED) + + # NS full : r2a = r2b + model_analyse_list.append(MODEL_NS_CPMG_2SITE_3D_FULL) + model_analyse_list.append(MODEL_NS_CPMG_2SITE_STAR_FULL) + + # The model. + model_analyse = model_analyse_list[10] ## Experiments # Exp 1 _______________________________________________ relax (http://www.nmr-relax.com) This is the relax-commits mailing list relax-commits@gna.org To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-commits