Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace local with nf-core modules #350

Merged
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added `OPENMS_IDMASSACCURACY` and `DATAMASH_HISTOGRAM` to compute fragment mass errors and visualizte them in multiQC report [#332](https://github.com/nf-core/mhcquant/pull/332)
- Added global fdr evaluation in new local subworkflow `RESCORE` [#338](https://github.com/nf-core/mhcquant/pull/338)
- Added `-weights` parameter in `OPENMS_PERCOLATORADAPTER` and visualize the median feature weights in multiQC report [#347](https://github.com/nf-core/mhcquant/pull/347)
- Replace local with nf-core modules [#350](https://github.com/nf-core/mhcquant/pull/347)

### `Fixed`

Expand Down
89 changes: 53 additions & 36 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ process {
]
}

withName: 'OPENMS_FILEFILTER' {
ext.prefix = {"${file.baseName}_filtered"}
ext.args = "-peak_options:rm_pc_charge 0"
publishDir = [
enabled: false
]
}

withName: 'OPENMS_DECOYDATABASE' {
ext.args = [
"-decoy_string DECOY_",
Expand All @@ -81,6 +89,51 @@ process {
]
}

withName: 'OPENMSTHIRDPARTY_COMETADAPTER' {
ext.prefix = {"${mzml.baseName}"}
ext.args = { [
(params.default_params_file_comet != " ") ? "-default_params_file ${params.default_params_file_comet}" : "",
"-pin_out ${mzml.baseName}_pin.tsv",
"-instrument ${params.instrument}",
"-spectrum_batch_size ${params.spectrum_batch_size}",
"-activation_method ${params.activation_method}",
"-precursor_mass_tolerance ${params.precursor_mass_tolerance}",
"-precursor_error_units ${params.precursor_error_units}",
"-fragment_mass_tolerance ${params.fragment_mass_tolerance}",
"-fragment_bin_offset ${params.fragment_bin_offset}",
"-num_hits ${params.num_hits}",
"-digest_mass_range ${params.digest_mass_range}",
"-max_variable_mods_in_peptide ${params.number_mods}",
"-missed_cleavages 0",
"-precursor_charge ${params.prec_charge}",
"-fixed_modifications ${params.fixed_mods.tokenize(',').collect {"'${it}'"}.join(" ")}",
"-variable_modifications ${params.variable_mods.tokenize(',').collect {"'${it}'"}.join(" ")}",
"-enzyme '${params.enzyme}'",
"-use_X_ions ${params.use_x_ions}",
"-use_Z_ions ${params.use_z_ions}",
"-use_A_ions ${params.use_a_ions}",
"-use_C_ions ${params.use_c_ions}",
"-use_NL_ions ${params.use_NL_ions}",
"-remove_precursor_peak ${params.remove_precursor_peak}"
].join(' ').trim() }
publishDir = [
path: {"${params.outdir}/intermediate_results/comet"},
mode: params.publish_dir_mode,
pattern: '*.tsv'
]
}

withName: 'OPENMS_PEPTIDEINDEXER' {
ext.prefix = {"${meta.id}_idx"}
ext.args = [
"-decoy_string DECOY",
"-enzyme:specificity none"
].join(' ').trim()
publishDir = [
enabled: false
]
}

withName: 'OPENMS_IDMERGER|OPENMS_IDMERGER_QUANT' {
ext.args = [
"-annotate_file_origin true",
Expand Down Expand Up @@ -220,12 +273,6 @@ process {
]
}

withName: 'OPENMS_FILEFILTER' {
publishDir = [
enabled: false
]
}

withName: 'PYOPENMS_CHROMATOGRAMEXTRACTOR' {
publishDir = [
enabled: false
Expand All @@ -251,36 +298,6 @@ process {
]
}

withName: 'OPENMS_COMETADAPTER' {
ext.args = [
"-precursor_mass_tolerance ${params.precursor_mass_tolerance}",
"-precursor_error_units ${params.precursor_error_units}",
"-fragment_mass_tolerance ${params.fragment_mass_tolerance}",
"-fragment_bin_offset ${params.fragment_bin_offset}",
"-instrument ${params.instrument}",
"-num_hits ${params.num_hits}",
"-digest_mass_range ${params.digest_mass_range}",
"-max_variable_mods_in_peptide ${params.number_mods}",
"-missed_cleavages 0",
"-precursor_charge ${params.prec_charge}",
"-activation_method ${params.activation_method}",
"-variable_modifications ${params.variable_mods.tokenize(',').collect {"'${it}'"}.join(" ")}",
"-enzyme '${params.enzyme}'",
"-spectrum_batch_size ${params.spectrum_batch_size}"
].join(' ').trim()
publishDir = [
path: {"${params.outdir}/intermediate_results/comet"},
mode: params.publish_dir_mode,
pattern: '*.tsv'
]
}

withName: 'OPENMS_PEPTIDEINDEXER' {
publishDir = [
enabled: false
]
}

withName: 'OPENMS_IDMASSACCURACY' {
ext.prefix = {"${meta.spectra}"}
ext.args = [
Expand Down
15 changes: 15 additions & 0 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
"git_sha": "bbcad23c681ff85336aef1c41345bc313d921b5d",
"installed_by": ["modules"]
},
"openms/filefilter": {
"branch": "master",
"git_sha": "26a34ecd378f06094eb253615932d8cc634474cb",
"installed_by": ["modules"]
},
"openms/idfilter": {
"branch": "master",
"git_sha": "bbcad23c681ff85336aef1c41345bc313d921b5d",
Expand Down Expand Up @@ -50,6 +55,16 @@
"git_sha": "bbcad23c681ff85336aef1c41345bc313d921b5d",
"installed_by": ["modules"]
},
"openms/peptideindexer": {
"branch": "master",
"git_sha": "573ba82ecf1505775d1a4332bc3cf55cacc3d094",
"installed_by": ["modules"]
},
"openmsthirdparty/cometadapter": {
"branch": "master",
"git_sha": "573ba82ecf1505775d1a4332bc3cf55cacc3d094",
"installed_by": ["modules"]
},
"thermorawfileparser": {
"branch": "master",
"git_sha": "2d0e53d398315b4e8ed06e81c175dc05d90f33d5",
Expand Down
69 changes: 0 additions & 69 deletions modules/local/openms_cometadapter.nf

This file was deleted.

45 changes: 0 additions & 45 deletions modules/local/openms_filefilter.nf

This file was deleted.

48 changes: 0 additions & 48 deletions modules/local/openms_peptideindexer.nf

This file was deleted.

5 changes: 5 additions & 0 deletions modules/nf-core/openms/filefilter/environment.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 55 additions & 0 deletions modules/nf-core/openms/filefilter/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading