Author: tlinnet
Date: Tue Sep 9 15:07:34 2014
New Revision: 25716
URL: http://svn.gna.org/viewcvs/relax?rev=25716&view=rev
Log:
Fix for calling correct folder with test intensities.
Task #7826 (https://gna.org/task/index.php?7826): Write an python class for
the repeated analysis of dispersion data.
Modified:
trunk/auto_analyses/relax_disp_repeat_cpmg.py
trunk/test_suite/system_tests/relax_disp.py
Modified: trunk/auto_analyses/relax_disp_repeat_cpmg.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/relax_disp_repeat_cpmg.py?rev=25716&r1=25715&r2=25716&view=diff
==============================================================================
--- trunk/auto_analyses/relax_disp_repeat_cpmg.py (original)
+++ trunk/auto_analyses/relax_disp_repeat_cpmg.py Tue Sep 9 15:07:34
2014
@@ -125,16 +125,15 @@
self.interpreter_start()
- def set_base_cpmg(self, glob_ini=None, force=False):
+ def set_base_cpmg(self, method=None, glob_ini=None, force=False):
""" Setup base information, but do not load intensity. """
# Define model
- method = 'setup'
model = 'setup'
analysis = 'setup'
# Check previous, and get the pipe name.
- found, pipe_name, resfile, path =
self.check_previous_result(method=method, model=model, analysis=analysis,
glob_ini='setup', bundle='setup')
+ found, pipe_name, resfile, path =
self.check_previous_result(method='setup', model=model, analysis=analysis,
glob_ini='setup', bundle='setup')
# If found, then pass, else calculate it.
if found:
@@ -154,10 +153,10 @@
cpmg_frqs = getattr(self, key)['cpmg_frqs']
# Get the folder for peak files.
- peaks_folder = getattr(self, key)['peaks_folder']
+ peaks_folder = getattr(self, key)['peaks_folder'] + sep +
method
# Define glop pattern for peak files.
- peaks_glob_pat = '%s*%.ser' % (glob_ini, self.method)
+ peaks_glob_pat = '%s*%s.ser' % (glob_ini, method)
# Get the file list.
peaks_file_list = glob(peaks_folder + sep + peaks_glob_pat)
@@ -227,10 +226,10 @@
spectrum_ids = cdp.dic_spectrum_ids[key]
# Get the folder for peak files.
- peaks_folder = getattr(self, key)['peaks_folder']
+ peaks_folder = getattr(self, key)['peaks_folder'] + sep +
self.method
# Define glop pattern for peak files.
- peaks_glob_pat = '%s*%.ser' % (glob_ini, self.method)
+ peaks_glob_pat = '%s*%s.ser' % (glob_ini, self.method)
# Get the file list.
peaks_file_list = glob(peaks_folder + sep + peaks_glob_pat)
Modified: trunk/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=25716&r1=25715&r2=25716&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Tue Sep 9 15:07:34 2014
@@ -5890,10 +5890,6 @@
# Setup dictionary with settings.
sdic = {}
- # Define method to analyse for
- sdic['method'] = 'FT'
- sdic['grid_inc'] = None
-
# Spectrometer frqs in list.
sfrq_1 = 499.86214
sfrq_2 = 599.8908587
@@ -5939,8 +5935,8 @@
sdic[e_2]['cpmg_frqs'] = ncyc_2 / sdic[e_2]['time_T2']
# Define peak lists.
- peaks_folder_1 = base_path +sep+ 'cpmg_disp_sod1d90a_060518' +sep+
'cpmg_disp_sod1d90a_060518_normal.fid' +sep+ 'analysis_FT' +sep+ 'ser_files'
+sep+ sdic['method']
- peaks_folder_2 = base_path +sep+ 'cpmg_disp_sod1d90a_060521' +sep+
'cpmg_disp_sod1d90a_060521_normal.fid' +sep+ 'analysis_FT' +sep+ 'ser_files'
+sep+ sdic['method']
+ peaks_folder_1 = base_path +sep+ 'cpmg_disp_sod1d90a_060518' +sep+
'cpmg_disp_sod1d90a_060518_normal.fid' +sep+ 'analysis_FT' +sep+ 'ser_files'
+ peaks_folder_2 = base_path +sep+ 'cpmg_disp_sod1d90a_060521' +sep+
'cpmg_disp_sod1d90a_060521_normal.fid' +sep+ 'analysis_FT' +sep+ 'ser_files'
sdic[e_1]['peaks_folder'] = peaks_folder_1
sdic[e_2]['peaks_folder'] = peaks_folder_2
@@ -5957,7 +5953,7 @@
RDR = Relax_disp_rep(sdic)
# Setup base information.
- RDR.set_base_cpmg(glob_ini=128)
+ RDR.set_base_cpmg(method='FT', glob_ini=128)
methods = ['FT', 'MDD']
#methods = ['FT']
r25716 - in /trunk: auto_analyses/relax_disp_repeat_cpmg.py test_suite/system_tests/relax_disp.py