Author: semor
Date: Fri Jun 17 17:20:03 2011
New Revision: 13113
URL: http://svn.gna.org/viewcvs/relax?rev=13113&view=rev
Log:
Modified the tests (and sample script) for the new name of the exponential
decay function.
Indeed, the name 'exp' for the exponential decay function has been changed to
'exp_2param_neg'.
Modified:
branches/inversion-recovery/sample_scripts/relax_fit.py
branches/inversion-recovery/test_suite/system_tests/relax_fit.py
branches/inversion-recovery/test_suite/system_tests/scripts/1UBQ_relax_fit.py
branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit.py
Modified: branches/inversion-recovery/sample_scripts/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/sample_scripts/relax_fit.py?rev=13113&r1=13112&r2=13113&view=diff
==============================================================================
--- branches/inversion-recovery/sample_scripts/relax_fit.py (original)
+++ branches/inversion-recovery/sample_scripts/relax_fit.py Fri Jun 17
17:20:03 2011
@@ -1,6 +1,7 @@
###############################################################################
#
#
# Copyright (C) 2004-2008 Edward d'Auvergne
#
+# Copyright (C) 2011 Sebastien Morin
#
#
#
# This file is part of the program relax.
#
#
#
@@ -79,7 +80,7 @@
deselect.read(file='unresolved')
# Set the relaxation curve type.
-relax_fit.select_model('exp')
+relax_fit.select_model('exp_2param_neg')
# Grid search.
grid_search(inc=11)
Modified: branches/inversion-recovery/test_suite/system_tests/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/relax_fit.py?rev=13113&r1=13112&r2=13113&view=diff
==============================================================================
--- branches/inversion-recovery/test_suite/system_tests/relax_fit.py
(original)
+++ branches/inversion-recovery/test_suite/system_tests/relax_fit.py Fri Jun
17 17:20:03 2011
@@ -1,6 +1,7 @@
###############################################################################
#
#
# Copyright (C) 2006-2010 Edward d'Auvergne
#
+# Copyright (C) 2011 Sebastien Morin
#
#
#
# This file is part of the program relax.
#
#
#
@@ -69,7 +70,7 @@
i0 = [None, None, None, 1996050.9679873895, 2068490.9458262245,
1611556.5193290685, 1362887.2329727132, 1877670.5629299041, None, None, None,
897044.17270784755]
# Some checks.
- self.assertEqual(cdp.curve_type, 'exp')
+ self.assertEqual(cdp.curve_type, 'exp_2param_neg')
self.assertEqual(cdp.int_method, ds.int_type)
self.assertEqual(len(cdp.relax_times), 10)
cdp_relax_times = sorted(cdp.relax_times.values())
Modified:
branches/inversion-recovery/test_suite/system_tests/scripts/1UBQ_relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/scripts/1UBQ_relax_fit.py?rev=13113&r1=13112&r2=13113&view=diff
==============================================================================
---
branches/inversion-recovery/test_suite/system_tests/scripts/1UBQ_relax_fit.py
(original)
+++
branches/inversion-recovery/test_suite/system_tests/scripts/1UBQ_relax_fit.py
Fri Jun 17 17:20:03 2011
@@ -76,7 +76,7 @@
spectrum.error_analysis()
# Set the relaxation curve type.
-relax_fit.select_model('exp')
+relax_fit.select_model('exp_2param_neg')
# Grid search.
grid_search(inc=11)
Modified:
branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit.py?rev=13113&r1=13112&r2=13113&view=diff
==============================================================================
--- branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit.py
(original)
+++ branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit.py
Fri Jun 17 17:20:03 2011
@@ -75,7 +75,7 @@
deselect.read(file='unresolved', dir=data_path, res_num_col=1)
# Set the relaxation curve type.
-relax_fit.select_model('exp')
+relax_fit.select_model('exp_2param_neg')
# Grid search.
grid_search(inc=11)
r13113 - in /branches/inversion-recovery: sample_scripts/ test_suite/system_tests/ test_suite/system_tests/scripts/