Skip to content

Commit 263c30f

Browse files
author
Tobias Hofmann
committed
fixed trinity bug
1 parent d364be5 commit 263c30f

File tree

5 files changed

+39
-5
lines changed

5 files changed

+39
-5
lines changed

recipe/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set version = "1.1.9" %}
1+
{% set version = "1.1.10" %}
22

33
package:
44
name: secapr
@@ -7,7 +7,7 @@ package:
77
source:
88
fn: secapr_{{ version }}.tar.gz
99
url: https://github.com/AntonelliLab/seqcap_processor/archive/v{{ version }}.tar.gz
10-
sha256: ca80b1d8fa99e572ffe0a7a7c09f77cfa0f2701cb4ffeb21a6b1a4468640b059
10+
sha256: 175830fa23619a374719c12340504fb50f9b00d6136b49c2a925873ecda687d1
1111

1212
build:
1313
skip: True # [not py27]

secapr.egg-info/PKG-INFO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 1.1
22
Name: secapr
3-
Version: 1.1.0+45.ge31aab9.dirty
3+
Version: 1.1.0+47.gd364be5.dirty
44
Summary: Process sequence-capture fastq files into alignments for phylogenetic analyses
55
Home-page: https://github.com/AntonelliLab/seqcap_processor
66
Author: Tobias Hofmann

secapr/assemble_reads.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def main(args):
131131
print ('#' * 50)
132132
print ("Processing sample %s" %sample_id)
133133
if assembler == "trinity":
134-
assembly_trinity(forward,backward,sample_output_folder,sample_id,cores,min_length)
134+
assembly_trinity(forward,backward,sample_output_folder,sample_id,cores,min_length,max_memory)
135135
contig_count_df = get_trinity_stats(sample_output_folder,sample_id,sample_contig_count_dict)
136136
cleanup_trinity_assembly_folder(sample_output_folder,sample_id)
137137
print ("#" * 50)

secapr/locus_selection.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,10 @@ def extract_best_loci(subfolder_file_dict,sample_bam_dict,output_folder,n,thresh
248248
convert_to_bam = 'samtools view -Sb %s > %s' %(sam_output_file,bam_output_file)
249249
os.system(convert_to_bam)
250250
sorted_bam_out = os.path.join(output_subfolder_dict[sample],"%s_%s_selected_loci_sorted.bam" %(sample,input_type))
251-
sort_bam = 'samtools sort %s > %s' %(bam_output_file,sorted_bam_out)
251+
sort_bam = 'samtools sort %s %s' %(bam_output_file,sorted_bam_out.replace('.bam',''))
252252
os.system(sort_bam)
253+
index_bam = 'samtools index %s' %(sorted_bam_out)
254+
os.system(index_bam)
253255
return target_loci
254256

255257

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
3+
"""
4+
Created on Wed Jun 27 10:47:27 2018
5+
6+
@author: tobias
7+
"""
8+
9+
import numpy as np
10+
import pandas as pd
11+
from functools import reduce
12+
13+
read_cov_overview = '/Users/tobias/GitHub/seqcap_processor/data/processed/remapped_reads/average_cov_per_locus.txt'
14+
read_cov_overview_df = pd.read_csv(read_cov_overview,sep='\t')
15+
16+
loci_names = read_cov_overview_df['locus'].values
17+
good_exons = []
18+
sample_exon_count_dict = {}
19+
for sample in read_cov_overview_df.columns:
20+
if not sample =='locus':
21+
values = read_cov_overview_df[sample].values
22+
num_loci_high_coverage = len(values[values>3])
23+
sample_exon_count_dict.setdefault(sample,num_loci_high_coverage)
24+
good_loci_names = loci_names[values>3]
25+
good_exons.append(good_loci_names)
26+
27+
loci_present_in_all_samples = reduce(np.intersect1d, (good_exons))
28+
29+
30+
exons_per_sample = list(sample_exon_count_dict.values())
31+
np.mean(exons_per_sample)
32+
np.std(exons_per_sample)

0 commit comments

Comments
 (0)