fix conda locations and minor version update

maxibor · Nov 19, 2018 · ffc2dbd · ffc2dbd
1 parent af69bb3
commit ffc2dbd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/adrsm b/adrsm
@@ -129,7 +129,7 @@ def read_config(infile):
 
 
 if __name__ == "__main__":
-    version = 0.9
+    version = "0.9.1"
     INFILE, READLEN, NBINOM, A1, A2, ERR, GEOM_P, THEMIN, THEMAX, OUTFILE, STATS, SEED, PROCESS = _get_args()
 
     MINLENGTH = 20

diff --git a/lib/adrsmlib.py b/lib/adrsmlib.py
@@ -172,26 +172,28 @@ def markov_multi_rev(process, nreads):
 
 def get_fwd_qual():
     try:
-        pickle.load(open("fwd_qual.p", 'rb'))
+        ret = pickle.load(open("data/quality/fwd_qual.p", 'rb'))
+        return(ret)
     except FileNotFoundError:
         cmd = "which adrsm"
         res = subprocess.check_output(cmd, shell=True)
         res = res.decode('utf-8').rstrip()
         path = "/".join(res.split("/")[:-2])+"/data/quality/fwd_qual.p"
         ret = pickle.load(open(path, 'rb'))
-    return(ret)
+        return(ret)
 
 
 def get_rev_qual():
     try:
-        pickle.load(open("fwd_qual.p", 'rb'))
+        ret = pickle.load(open("data/quality/fwd_qual.p", 'rb'))
+        return(ret)
     except FileNotFoundError:
         cmd = "which adrsm"
         res = subprocess.check_output(cmd, shell=True)
         res = res.decode('utf-8').rstrip()
         path = "/".join(res.split("/")[:-2])+"/data/quality/rev_qual.p"
         ret = pickle.load(open(path, 'rb'))
-    return(ret)
+        return(ret)
 
 
 def run_read_simulation_multi(INFILE, COV, READLEN, INSERLEN, NBINOM, A1, A2, MINLENGTH, MUTATE, MUTRATE, AGE, ERR,  DAMAGE, GEOM_P, THEMIN, THEMAX, fastq_dict, PROCESS):