Author: bugman Date: Fri Sep 25 14:13:04 2015 New Revision: 27872 URL: http://svn.gna.org/viewcvs/relax?rev=27872&view=rev Log: Merged revisions 27847 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r27847 | tlinnet | 2015-05-29 18:32:43 +0200 (Fri, 29 May 2015) | 5 lines Small fix for the shell script to collect data files, and not use the program "column" in the end. The line width becomes to large to handle for column. Task #7826 (https://gna.org/task/?7826): Write an python class for the repeated analysis of dispersion data. ........ Modified: branches/frame_order_cleanup/ (props changed) branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py Propchange: branches/frame_order_cleanup/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri Sep 25 14:13:04 2015 @@ -1 +1 @@ -/trunk:1-27797,27800-27846 +/trunk:1-27797,27800-27847 Modified: branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py?rev=27872&r1=27871&r2=27872&view=diff ============================================================================== --- branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py (original) +++ branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py Fri Sep 25 14:13:04 2015 @@ -2812,7 +2812,8 @@ file_obj.write(' tail -n+3 $f | sed "s,^# ,," | grep -v "None None" | sed "s,value,${NI}," | sed "s,error,${NI}," | awk %s{print $6,$7}%s | column -t > ${FNAME}.tmp'%("'","'") + '\n') file_obj.write(' ACUT+=(${FNAME}.tmp)' + '\n') file_obj.write('done' + '\n') - file_obj.write('paste "${ACUT[@]}" | column -t > collect_${SEARCH}.txt' + '\n') + file_obj.write('#paste "${ACUT[@]}" | column -t > collect_${SEARCH}.txt' + '\n') + file_obj.write('paste "${ACUT[@]}" > collect_${SEARCH}.txt' + '\n') file_obj.write('rm ${ACUT[@]}' + '\n')