Skip to content

Commit 46beafa

Browse files
committed
fix cascadia search
1 parent 785ff57 commit 46beafa

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

main.nf

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ workflow {
148148
replicate_metadata = get_input_files.out.replicate_metadata
149149
}
150150
fasta = get_input_files.out.fasta
151-
skyline_fasta = get_input_files.out.skyline_fasta
152151
skyline_template_zipfile = get_input_files.out.skyline_template_zipfile
153152
skyr_file_ch = get_input_files.out.skyr_files
154153

@@ -161,7 +160,13 @@ workflow {
161160
)
162161
search_engine_version = dia_search.out.search_engine_version
163162
final_speclib = dia_search.out.final_speclib
164-
fasta = dia_search.out.search_fasta
163+
164+
if (params.search_engine.toLowerCase() == 'cascadia') {
165+
// Always use fasta generated by Cascadia search for Skyline
166+
skyline_fasta = dia_search.out.search_fasta
167+
} else {
168+
skyline_fasta = get_input_files.out.skyline_fasta
169+
}
165170

166171
skyline (
167172
wide_mzml_ch,
@@ -179,7 +184,7 @@ workflow {
179184
dia_qc_version).splitText()
180185

181186
input_files = fasta.map{ it -> ['Fasta file', it.name] }.concat(
182-
fasta.map{ it -> ['Skyline fasta file', it.name] },
187+
skyline_fasta.map{ it -> ['Skyline fasta file', it.name] },
183188
spectral_library.map{ it -> ['Spectra library', it.baseName] },
184189
all_mzml_ch.map{ it -> ['Spectra file', it.baseName] })
185190

@@ -205,7 +210,7 @@ workflow {
205210
search_engine,
206211
skyline.out.final_skyline_file,
207212
all_mzml_ch,
208-
fasta,
213+
dia_search.out.search_fasta,
209214
spectral_library,
210215
config_file,
211216
run_details_file,

0 commit comments

Comments
 (0)