Author: bugman
Date: Mon Dec 8 17:58:26 2014
New Revision: 27025
URL: http://svn.gna.org/viewcvs/relax?rev=27025&view=rev
Log:
Updated all of the system tests for the cdp.nmrglue data structure changes.
Modified:
branches/nmrglue/test_suite/system_tests/nmrglue.py
Modified: branches/nmrglue/test_suite/system_tests/nmrglue.py
URL:
http://svn.gna.org/viewcvs/relax/branches/nmrglue/test_suite/system_tests/nmrglue.py?rev=27025&r1=27024&r2=27025&view=diff
==============================================================================
--- branches/nmrglue/test_suite/system_tests/nmrglue.py (original)
+++ branches/nmrglue/test_suite/system_tests/nmrglue.py Mon Dec 8 17:58:26 2014
@@ -259,7 +259,7 @@
# Loop over id ref:
for ng_id in ids_ref:
- data = cdp.nmrglue_data[ng_id]
+ data = cdp.nmrglue[ng_id].data
data_flat = data.flatten()
print(ng_id, data.shape, data_flat.shape)
np_arr_ref = concatenate( (np_arr_ref, data_flat) )
@@ -269,7 +269,7 @@
# Loop over id ref:
for ng_id in ids_met:
- data = cdp.nmrglue_data[ng_id]
+ data = cdp.nmrglue[ng_id].data
data_flat = data.flatten()
print(ng_id, data.shape, data_flat.shape)
np_arr_met = concatenate( (np_arr_met, data_flat) )
@@ -316,9 +316,9 @@
self.interpreter.spectrum.nmrglue_read(file=fname, dir=ft2_folder_1,
nmrglue_id=sp_id)
# Extract the data.
- dic = cdp.nmrglue_dic[sp_id]
- udic = cdp.nmrglue_udic[sp_id]
- data = cdp.nmrglue_data[sp_id]
+ dic = cdp.nmrglue[sp_id].dic
+ udic = cdp.nmrglue[sp_id].udic
+ data = cdp.nmrglue[sp_id].data
# Plot the histogram.
kwargs = {'bins': 3000, 'range': None, 'normed': False,
'facecolor':'green', 'alpha':0.75}
@@ -346,8 +346,8 @@
self.interpreter.spectrum.nmrglue_read(file=basename_list,
dir=ft2_folder_1, nmrglue_id=file_root_list)
# Extract the data.
- data_0 = cdp.nmrglue_data[file_root_list[0]]
- data_1 = cdp.nmrglue_data[file_root_list[1]]
+ data_0 = cdp.nmrglue[file_root_list[0]].data
+ data_1 = cdp.nmrglue[file_root_list[1]].data
# First flatten arrays, and then merge them.
data = concatenate( (data_0.flatten(), data_1.flatten() ) )
@@ -369,9 +369,9 @@
self.assertEqual(cdp.nmrglue_ids[0], sp_id)
# Extract the data.
- dic = cdp.nmrglue_dic[sp_id]
- udic = cdp.nmrglue_udic[sp_id]
- data = cdp.nmrglue_data[sp_id]
+ dic = cdp.nmrglue[sp_id].dic
+ udic = cdp.nmrglue[sp_id].udic
+ data = cdp.nmrglue[sp_id].data
# Test the data.
self.assertEqual(udic[0]['label'], '15N')
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
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
