From 495228f7167a6df24a139022e7a0560a4dd07b56 Mon Sep 17 00:00:00 2001 From: Calvin Morrison Date: Wed, 26 Mar 2014 21:05:25 -0400 Subject: majorly rewrite and revamp the script to support runnign parts at a time --- src/score_mers.py | 2 +- src/score_wrapper.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/score_mers.py b/src/score_mers.py index 07d2ff9..aaf8e13 100755 --- a/src/score_mers.py +++ b/src/score_mers.py @@ -197,7 +197,7 @@ def score_mers(selected): print "" print "Reasons mers were excluded:\n" print " max distance: " + percentage(excluded[0], total_reject) + " (" + str(excluded[0]) + ")" - print " max_overlaps: " + percentage(excluded[1], total_reject) + " (" + str(excluded[1]) + ")" + print " mers overlap: " + percentage(excluded[1], total_reject) + " (" + str(excluded[1]) + ")" print " heterodimers: " + percentage(excluded[2], total_reject) + " (" + str(excluded[2]) + ")" print "" print " total combinations checked: ", total_checked diff --git a/src/score_wrapper.sh b/src/score_wrapper.sh index 4e1a6bd..1c6f856 100755 --- a/src/score_wrapper.sh +++ b/src/score_wrapper.sh @@ -5,13 +5,11 @@ function clean_exit { echo -e "\nInterrupt caught. Exiting cleanly..." echo "killing $pid" kill -11 $pid - sleep 1 + sleep .5 exit } trap clean_exit SIGINT - -echo "score_mers.py $1 $2 $3 $4 &" score_mers.py $1 $2 $3 $4 &