r27836 - /trunk/auto_analyses/relax_disp_repeat_cpmg.py -- May 27, 2015 - 03:09

Author: tlinnet
Date: Wed May 27 03:09:40 2015
New Revision: 27836

URL: http://svn.gna.org/viewcvs/relax?rev=27836&view=rev
Log:
In the collection bash script, removes spins which have not been fitted.

Task #7826 (https://gna.org/task/?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=27836&r1=27835&r2=27836&view=diff
==============================================================================
--- trunk/auto_analyses/relax_disp_repeat_cpmg.py       (original)
+++ trunk/auto_analyses/relax_disp_repeat_cpmg.py       Wed May 27 03:09:40 
2015
@@ -2795,14 +2795,14 @@
         file_obj.write('FILES=(*_${SEARCH}.out)' + '\n')
         file_obj.write('readarray -t FILESSORT < <(for a in "${FILES[@]}"; 
do echo "$a"; done | sort -Vr)' + '\n')
         file_obj.write('# Skip the first two lines of header' + '\n')
-        file_obj.write("tail -n+3 ${FILESSORT[0]} | sed 's,^# ,,' | awk 
'{print $2,$3,$5}' | column -t > collect_${SEARCH}.tmp" + '\n')
+        file_obj.write("tail -n+3 ${FILESSORT[0]} | sed 's,^# ,,' | grep -v 
"None                    None" | awk '{print $2,$3,$5}' | column -t > 
collect_${SEARCH}.tmp" + '\n')
         file_obj.write('# Make array' + '\n')
         file_obj.write('ACUT=(collect_${SEARCH}.tmp)' + '\n')
         file_obj.write('for f in "${FILESSORT[@]}"; do' + '\n')
         file_obj.write('    FNAME="${f%.*}"' + '\n')
         file_obj.write('    NI=`echo $f | cut -d"_" -f1`' + '\n')
         file_obj.write('    echo "Processing $f with NI=$NI"' + '\n')
-        file_obj.write('    tail -n+3 $f | sed "s,^# ,," | sed 
"s,value,${NI}," | sed "s,error,${NI}," | awk %s{print $6,$7}%s | column -t > 
${FNAME}.tmp'%("'","'") + '\n')
+        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')