Skip to content

Commit e596ade

Browse files
committed
rm demux_just_fwd_processing splitter_binary
1 parent dea4fd9 commit e596ade

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

src/sequence_processing_pipeline/Commands.py

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,9 @@ def demux_just_fwd_processing(id_map, fp, out_d, task, maxtask):
252252
dumb = iter(fp)
253253
qual = iter(fp)
254254

255+
# there is only fwd so the orientation is always '1'
256+
orientation = '1'
257+
255258
for i, s, d, q in zip(seq_id, seq, dumb, qual):
256259
# '@1', 'LH00444:84:227CNHLT4:7:1101:41955:2443/1'
257260
# '@1', 'LH00444:84:227CNHLT4:7:1101:41955:2443/1 BX:Z:TATGACACATGCGGCCCT' # noqa
@@ -267,25 +270,6 @@ def demux_just_fwd_processing(id_map, fp, out_d, task, maxtask):
267270

268271
current_fp = openfps[fname_encoded]
269272

270-
# remove '\n' from sid and split on all whitespace.
271-
tmp = sid.strip().split()
272-
273-
if len(tmp) == 1:
274-
# sequence id line contains no optional metadata.
275-
# don't change sid.
276-
# -1 is \n
277-
orientation = sid[-2]
278-
sid = rec + sid
279-
elif len(tmp) == 2:
280-
sid = tmp[0]
281-
metadata = tmp[1]
282-
# no '\n'
283-
orientation = sid[-1]
284-
# hexdump confirms separator is ' ', not '\t'
285-
sid = rec + sid + ' ' + metadata + '\n'
286-
else:
287-
raise ValueError(f"'{sid}' is not a recognized form")
288-
289273
current_fp[orientation].write(sid)
290274
current_fp[orientation].write(s)
291275
current_fp[orientation].write(d)

src/sequence_processing_pipeline/templates/nuqc_job_single.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,6 @@ function mux-runner () {
125125
python {{pmls_path}} <(zcat ${jobd}/seqs.movi.txt.gz) {{pmls_extra_parameters}} | \
126126
seqtk subseq ${seq_reads_filter_alignment} - > ${jobd}/seqs.final.fastq
127127

128-
{{splitter_binary}} ${jobd}/seqs.final.fastq \
129-
${jobd}/reads.r1.fastq ${delimiter} ${r1_tag} &
130-
wait
131-
132128
# keep seqs.movi.txt and migrate it to NuQCJob directory.
133129
mv ${jobd}/seqs.movi.txt.gz {{output_path}}/logs/seqs.movi.${SLURM_ARRAY_TASK_ID}.txt.gz
134130
}
@@ -139,7 +135,7 @@ function demux-runner () {
139135
n_demux_jobs=${SLURM_CPUS_PER_TASK}
140136
jobd=${TMPDIR}
141137
id_map=${jobd}/id_map
142-
seqs_r1=${jobd}/reads.r1.fastq.paired.fq
138+
seqs_r1=${jobd}/seqs.final.fastq
143139

144140
id_map=${jobd}/id_map
145141
if [[ ! -f ${id_map} ]]; then

0 commit comments

Comments
 (0)