-
Notifications
You must be signed in to change notification settings - Fork 58
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
metamorpheus initial commit #587
base: master
Are you sure you want to change the base?
Conversation
Add galaxy tools for the MetaMorpheus application. MetaMorpheus is a bottom-up proteomics database search software with integrated post-translational modification (PTM) discovery capability.
@bernt-matthias Here's my initial commit for MetaMorpheus. It's still a little rough and needed plenty of testing. If you are willing to help with that, making sure that it meets the need of your clients, it would be much appreciated. I haven't implemented tools for the GlycoSearchTask or the XLSearchTask as yet. I also want to check out using MetaMorpheus for Neoantigen HLA-bound searching: https://github.com/smith-chem-wisc/MetaMorpheus/wiki/1_New-Task:-Non-specific-cleavage-(%22No-Enzyme%22,-%22Non-specific%22)-searches |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @jj-umn. This looks great.
If you like I could ask my colleague who was interested to test this.
@@ -0,0 +1,65 @@ | |||
<tool id="metamorpheus_calibration" name="MetaMorpeus Calibration" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" python_template_version="3.5"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<tool id="metamorpheus_calibration" name="MetaMorpeus Calibration" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" python_template_version="3.5"> | |
<tool id="metamorpheus_calibration" name="MetaMorpeus Calibration" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="20.01"> |
]]></token> | ||
|
||
<xml name="dissociation_options"> | ||
<option value="Any">Any</option> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you fix indentation here?
[CommonParameters] | ||
TaskDescriptor = "CalibrateTask" | ||
MaxThreadsToUsePerFile = 11 | ||
#if $common.set_common == 'yes' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer to use sections instead of conditionals. Then you may skip this if-else and just use the defaults in the tool form (I guess they are the same anyway).
The disadvantage of conditionals is that they can not be changed in workflows.
Also we would know if there are no typos in the code that is currently in the if branch and the sytnax is correct (ie accepted by MM).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These config yaml files may change by the version. They can be generated with metamorpheus -g
, so if possible, it might be worth adding a test to make sure the default parameters and parameter names haven't changed since the last version.
MS3ChildScanDissociationType = "Unknown" | ||
#end if | ||
</token> | ||
<xml name="mods_params"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this needed?
</requirements> | ||
</xml> | ||
|
||
<token name="@DEFAULT_COMMON_TOML@"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the idea of this toml file? There seems to be some intersections with the others? Should the parameters be configurable?
#set $m = $re.match('^(\[.+\])$', $entry) | ||
#if $m: | ||
#set $category = $m.groups()[0] | ||
#if $category not in $config['categories']: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think #if $category not in $config
should work, i.e. it should not be necessary to store the categories in $config['categories']
.
]]></token> | ||
|
||
<token name="@MERGE_TOMLS@"><![CDATA[ | ||
#def merge_tomls($tomls, $merged): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I only checked the code roughly. Can you tell we how does this differs from just concatenating the files.
<expand macro="calibrated_outputs"/> | ||
</outputs> | ||
<tests> | ||
<test> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you add expect_num_outputs
.. which is always a good idea if there are outputs with filters.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tests are not running because .shed.yml
is missing.
@bernt-matthias I suspect the tests will now fail because the toml datatype has only made it to the dev branch. |
True. I think the 21.05 branch will become available today. Then we can adapt the pr workflow. Then we should also use profile 21.05. |
Add profile 21.05 for toml datatype Fix metamorpheus_calibration.xml test output element name
Seems that MM tries to access a missing file / write to the installation dir.
|
@bernt-matthias @bgruening @acesnik |
Add --mmsettings option to prevent attempts to write to install code directory
…into metamorpheus
We will need a |
Don't expect exact number of reported datapoints
MetaMorpheus param fixes - need double quotes around string types
Good hints here: smith-chem-wisc/MetaMorpheus#2054 |
Add galaxy tools for the MetaMorpheus application.
MetaMorpheus is a bottom-up proteomics database search software with integrated post-translational modification (PTM) discovery capability.