Author: tlinnet Date: Tue Sep 16 02:44:55 2014 New Revision: 25854 URL: http://svn.gna.org/viewcvs/relax?rev=25854&view=rev Log: Fix for globbing, to prevent incidentally taking wrong intensity file. 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 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=25854&r1=25853&r2=25854&view=diff ============================================================================== --- trunk/auto_analyses/relax_disp_repeat_cpmg.py (original) +++ trunk/auto_analyses/relax_disp_repeat_cpmg.py Tue Sep 16 02:44:55 2014 @@ -157,7 +157,7 @@ peaks_folder = getattr(self, key)['peaks_folder'] + sep + method # Define glop pattern for peak files. - peaks_glob_pat = '%s*%s.ser' % (glob_ini, method) + peaks_glob_pat = '%s_%s.ser' % (glob_ini, method) # Get the file list. peaks_file_list = glob(peaks_folder + sep + peaks_glob_pat) @@ -230,7 +230,7 @@ peaks_folder = getattr(self, key)['peaks_folder'] + sep + self.method # Define glop pattern for peak files. - peaks_glob_pat = '%s*%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) @@ -247,7 +247,7 @@ rmsd_folder = getattr(self, key)['rmsd_folder'] # Define glop pattern for rmsd files. - rmsd_glob_pat = '%s*%s.rmsd' % (glob_ini, self.method) + rmsd_glob_pat = '%s_*_%s.rmsd' % (glob_ini, self.method) # Get the file list. rmsd_file_list = glob(rmsd_folder + sep + rmsd_glob_pat)