@@ -109,12 +109,16 @@ def fastq_read_pass_filter(fastq_read):
109109 <param name =" max_quality" value =" 0" />
110110 <param name =" max_num_deviants" value =" 0" />
111111 <param name =" paired_end" value =" false" />
112- <param name =" base_offset_type" value =" offsets_absolute" />
113- <param name =" left_column_offset" value =" 0" />
114- <param name =" right_column_offset" value =" 0" />
115- <param name =" score_operation" value =" min" />
116- <param name =" score_comparison" value =" > =" />
117- <param name =" score" value =" 0" />
112+ <repeat name =" fastq_filters" >
113+ <conditional name =" offset_type" >
114+ <param name =" base_offset_type" value =" offsets_absolute" />
115+ <param name =" left_column_offset" value =" 0" />
116+ <param name =" right_column_offset" value =" 0" />
117+ </conditional >
118+ <param name =" score_operation" value =" min" />
119+ <param name =" score_comparison" value =" > =" />
120+ <param name =" score" value =" 0" />
121+ </repeat >
118122 <output name =" output_file" file =" sanger_full_range_original_sanger.fastqsanger" ftype =" fastqsanger" />
119123 </test >
120124 <!-- Do nothing filter compressed -->
@@ -126,12 +130,16 @@ def fastq_read_pass_filter(fastq_read):
126130 <param name =" max_quality" value =" 0" />
127131 <param name =" max_num_deviants" value =" 0" />
128132 <param name =" paired_end" value =" false" />
129- <param name =" base_offset_type" value =" offsets_absolute" />
130- <param name =" left_column_offset" value =" 0" />
131- <param name =" right_column_offset" value =" 0" />
132- <param name =" score_operation" value =" min" />
133- <param name =" score_comparison" value =" > =" />
134- <param name =" score" value =" 0" />
133+ <repeat name =" fastq_filters" >
134+ <conditional name =" offset_type" >
135+ <param name =" base_offset_type" value =" offsets_absolute" />
136+ <param name =" left_column_offset" value =" 0" />
137+ <param name =" right_column_offset" value =" 0" />
138+ </conditional >
139+ <param name =" score_operation" value =" min" />
140+ <param name =" score_comparison" value =" > =" />
141+ <param name =" score" value =" 0" />
142+ </repeat >
135143 <output name =" output_file" file =" sanger_full_range_original_sanger.fastqsanger.gz" ftype =" fastqsanger.gz" decompress =" true" />
136144 </test >
137145 <!-- crippled input types prevent this test <test>
@@ -159,12 +167,16 @@ def fastq_read_pass_filter(fastq_read):
159167 <param name =" max_quality" value =" 0" />
160168 <param name =" max_num_deviants" value =" 0" />
161169 <param name =" paired_end" value =" false" />
162- <param name =" base_offset_type" value =" offsets_absolute" />
163- <param name =" left_column_offset" value =" 0" />
164- <param name =" right_column_offset" value =" 0" />
165- <param name =" score_operation" value =" min" />
166- <param name =" score_comparison" value =" > =" />
167- <param name =" score" value =" 0" />
170+ <repeat name =" fastq_filters" >
171+ <conditional name =" offset_type" >
172+ <param name =" base_offset_type" value =" offsets_absolute" />
173+ <param name =" left_column_offset" value =" 0" />
174+ <param name =" right_column_offset" value =" 0" />
175+ </conditional >
176+ <param name =" score_operation" value =" min" />
177+ <param name =" score_comparison" value =" > =" />
178+ <param name =" score" value =" 0" />
179+ </repeat >
168180 <output name =" output_file" file =" sanger_full_range_as_cssanger.fastqcssanger" ftype =" fastqcssanger" />
169181 </test >
170182 <!-- Remove all Filter -->
@@ -176,12 +188,16 @@ def fastq_read_pass_filter(fastq_read):
176188 <param name =" max_quality" value =" 0" />
177189 <param name =" max_num_deviants" value =" 0" />
178190 <param name =" paired_end" value =" false" />
179- <param name =" base_offset_type" value =" offsets_absolute" />
180- <param name =" left_column_offset" value =" 0" />
181- <param name =" right_column_offset" value =" 0" />
182- <param name =" score_operation" value =" min" />
183- <param name =" score_comparison" value =" > =" />
184- <param name =" score" value =" 0" />
191+ <repeat name =" fastq_filters" >
192+ <conditional name =" offset_type" >
193+ <param name =" base_offset_type" value =" offsets_absolute" />
194+ <param name =" left_column_offset" value =" 0" />
195+ <param name =" right_column_offset" value =" 0" />
196+ </conditional >
197+ <param name =" score_operation" value =" min" />
198+ <param name =" score_comparison" value =" > =" />
199+ <param name =" score" value =" 0" />
200+ </repeat >
185201 <output name =" output_file" file =" empty_file.dat" ftype =" fastqsanger" />
186202 </test >
187203 <!-- crippled input types prevent this test <test>
@@ -209,12 +225,16 @@ def fastq_read_pass_filter(fastq_read):
209225 <param name =" max_quality" value =" 0" />
210226 <param name =" max_num_deviants" value =" 1" />
211227 <param name =" paired_end" value =" false" />
212- <param name =" base_offset_type" value =" offsets_absolute" />
213- <param name =" left_column_offset" value =" 0" />
214- <param name =" right_column_offset" value =" 0" />
215- <param name =" score_operation" value =" min" />
216- <param name =" score_comparison" value =" > =" />
217- <param name =" score" value =" 0" />
228+ <repeat name =" fastq_filters" >
229+ <conditional name =" offset_type" >
230+ <param name =" base_offset_type" value =" offsets_absolute" />
231+ <param name =" left_column_offset" value =" 0" />
232+ <param name =" right_column_offset" value =" 0" />
233+ </conditional >
234+ <param name =" score_operation" value =" min" />
235+ <param name =" score_comparison" value =" > =" />
236+ <param name =" score" value =" 0" />
237+ </repeat >
218238 <output name =" output_file" file =" sanger_full_range_original_sanger.fastqsanger" ftype =" fastqsanger" />
219239 </test >
220240 <!-- crippled input types prevent this test<test>
@@ -242,12 +262,16 @@ def fastq_read_pass_filter(fastq_read):
242262 <param name =" max_quality" value =" 0" />
243263 <param name =" max_num_deviants" value =" 0" />
244264 <param name =" paired_end" value =" false" />
245- <param name =" base_offset_type" value =" offsets_absolute" />
246- <param name =" left_column_offset" value =" 1" />
247- <param name =" right_column_offset" value =" 1" />
248- <param name =" score_operation" value =" min" />
249- <param name =" score_comparison" value =" > =" />
250- <param name =" score" value =" 1" />
265+ <repeat name =" fastq_filters" >
266+ <conditional name =" offset_type" >
267+ <param name =" base_offset_type" value =" offsets_absolute" />
268+ <param name =" left_column_offset" value =" 1" />
269+ <param name =" right_column_offset" value =" 1" />
270+ </conditional >
271+ <param name =" score_operation" value =" min" />
272+ <param name =" score_comparison" value =" > =" />
273+ <param name =" score" value =" 1" />
274+ </repeat >
251275 <output name =" output_file" file =" sanger_full_range_original_sanger.fastqsanger" ftype =" fastqsanger" />
252276 </test >
253277 <test >
@@ -258,12 +282,16 @@ def fastq_read_pass_filter(fastq_read):
258282 <param name =" max_quality" value =" 0" />
259283 <param name =" max_num_deviants" value =" 0" />
260284 <param name =" paired_end" value =" false" />
261- <param name =" base_offset_type" value =" offsets_absolute" />
262- <param name =" left_column_offset" value =" 1" />
263- <param name =" right_column_offset" value =" 1" />
264- <param name =" score_operation" value =" max" />
265- <param name =" score_comparison" value =" < =" />
266- <param name =" score" value =" 92" />
285+ <repeat name =" fastq_filters" >
286+ <conditional name =" offset_type" >
287+ <param name =" base_offset_type" value =" offsets_absolute" />
288+ <param name =" left_column_offset" value =" 1" />
289+ <param name =" right_column_offset" value =" 1" />
290+ </conditional >
291+ <param name =" score_operation" value =" max" />
292+ <param name =" score_comparison" value =" < =" />
293+ <param name =" score" value =" 92" />
294+ </repeat >
267295 <output name =" output_file" file =" sanger_full_range_original_sanger.fastqsanger" ftype =" fastqsanger" />
268296 </test >
269297 <!-- percent based offsets -->
@@ -275,12 +303,16 @@ def fastq_read_pass_filter(fastq_read):
275303 <param name =" max_quality" value =" 0" />
276304 <param name =" max_num_deviants" value =" 0" />
277305 <param name =" paired_end" value =" false" />
278- <param name =" base_offset_type" value =" offsets_percent" />
279- <param name =" left_column_offset" value =" 1.075" />
280- <param name =" right_column_offset" value =" 1.075" />
281- <param name =" score_operation" value =" min" />
282- <param name =" score_comparison" value =" > =" />
283- <param name =" score" value =" 1" />
306+ <repeat name =" fastq_filters" >
307+ <conditional name =" offset_type" >
308+ <param name =" base_offset_type" value =" offsets_percent" />
309+ <param name =" left_column_offset" value =" 1.075" />
310+ <param name =" right_column_offset" value =" 1.075" />
311+ </conditional >
312+ <param name =" score_operation" value =" min" />
313+ <param name =" score_comparison" value =" > =" />
314+ <param name =" score" value =" 1" />
315+ </repeat >
284316 <output name =" output_file" file =" sanger_full_range_original_sanger.fastqsanger" ftype =" fastqsanger" />
285317 </test >
286318 <test >
@@ -291,12 +323,16 @@ def fastq_read_pass_filter(fastq_read):
291323 <param name =" max_quality" value =" 0" />
292324 <param name =" max_num_deviants" value =" 0" />
293325 <param name =" paired_end" value =" true" />
294- <param name =" base_offset_type" value =" offsets_percent" />
295- <param name =" left_column_offset" value =" 1" />
296- <param name =" right_column_offset" value =" 1" />
297- <param name =" score_operation" value =" min" />
298- <param name =" score_comparison" value =" > =" />
299- <param name =" score" value =" 1" />
326+ <repeat name =" fastq_filters" >
327+ <conditional name =" offset_type" >
328+ <param name =" base_offset_type" value =" offsets_percent" />
329+ <param name =" left_column_offset" value =" 1" />
330+ <param name =" right_column_offset" value =" 1" />
331+ </conditional >
332+ <param name =" score_operation" value =" min" />
333+ <param name =" score_comparison" value =" > =" />
334+ <param name =" score" value =" 1" />
335+ </repeat >
300336 <output name =" output_file" file =" empty_file.dat" ftype =" fastqsanger" />
301337 </test >
302338 </tests >
0 commit comments