Mercurial > repos > galaxyp > openms_filefilter

annotate readme.md @ 2:d6878d27f051 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
author galaxyp
date Thu, 27 Apr 2017 13:21:46 -0400
parents 020fc2600133
children 59adb20eb08a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
1 Galaxy wrapper for OpenMS
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
2 =========================
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
3
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
4 OpenMS is an open-source software C++ library for LC/MS data management and analyses.
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
5 It offers an infrastructure for the rapid development of mass spectrometry related software.
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
6 OpenMS is free software available under the three clause BSD license and runs under Windows, MacOSX and Linux.
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
7
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
8 More informations are available at:
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
9
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
10 * https://github.com/OpenMS/OpenMS
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
11 * http://open-ms.sourceforge.net
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
12
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
13
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
14 Generating OpenMS wrappers
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
15 ==========================
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
16
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
17 * install OpenMS (you can do this automatically through the Tool Shed)
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
18 * create a folder called CTD
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
19 * inside of your new installed openms/bin folder, execute the following command:
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
20
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
21 ```bash
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
22 for binary in `ls`; do ./$binary -write_ctd /PATH/TO/YOUR/CTD; done;
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
23 ```
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
24
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
25 * `MetaProSIP.ctd` includes a not supported character: To use it, search for `²` and replace it (e.g. with `^2`).
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
26
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
27 * clone or install CTDopts
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
28
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
29 ```bash
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
30 git clone https://github.com/genericworkflownodes/CTDopts
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
31 ```
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
32
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
33 * add CTDopts to your `$PYTHONPATH`
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
34
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
35 ```bash
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
36 export PYTHONPATH=/home/user/CTDopts/
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
37 ```
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
38
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
39 * clone or install CTD2Galaxy
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
40
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
41 ```bash
1
020fc2600133 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 820d990f9217706e693b8a2f1da91e13c09cb0fb
galaxyp
parents: 0
diff changeset
42 git clone https://github.com/WorkflowConversion/CTD2Galaxy.git
0
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
43 ```
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
44
1
020fc2600133 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 820d990f9217706e693b8a2f1da91e13c09cb0fb
galaxyp
parents: 0
diff changeset
45 * If you have CTDopts and CTD2Galaxy installed you are ready to generate Galaxy Tools from CTD definitions. Change the following command according to your needs, especially the `/PATH/TO` parts. The default files are provided in this repository.
0
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
46
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
47 ```bash
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
48 python generator.py \
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
49 -i /PATH/TO/YOUR/CTD/*.ctd \
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
50 -o ./PATH/TO/YOUR/WRAPPERS/ -t tool.conf \
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
51 -d datatypes_conf.xml -g openms \
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
52 -b version log debug test no_progress threads \
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
53 in_type executable myrimatch_executable \
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
54 fido_executable fidocp_executable \
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
55 omssa_executable pepnovo_executable \
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
56 xtandem_executable param_model_directory \
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
57 java_executable java_memory java_permgen \
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
58 -f /PATH/TO/filetypes.txt -m /PATH/TO/macros.xml \
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
59 -s PATH/TO/SKIP_TOOLS_FILES.txt
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
60 ```
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
61
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
62
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
63 * As last step you need to change manually the binary names of all external binaries you want to use in OpenMS. For example:
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
64
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
65 ```
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
66 sed -i '13 a\-fido_executable fido' wrappers/FidoAdapter.xml
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
67 sed -i '13 a\-fidocp_executable fido_choose_parameters' wrappers/FidoAdapter.xml
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
68 sed -i '13 a\-myrimatch_executable myrimatch' wrappers/MyriMatchAdapter.xml
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
69 sed -i '13 a\-omssa_executable omssa' wrappers/OMSSAAdapter.xml
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
70 sed -i '13 a\-xtandem_executable xtandem' wrappers/XTandemAdapter.xml
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
71 ```
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
72
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
73 * For some tools, additional work has to be done. In `MSGFPlusAdapter.xml` the following is needed in the command section at the beginning (check your file to know what to copy where):
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
74
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
75 ```
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
76 <command><![CDATA[
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
77
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
78 ## check input file type
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
79 #set $in_type = $param_in.ext
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
80
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
81 ## create the symlinks to set the proper file extension, since msgf uses them to choose how to handle the input files
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
82 ln -s '$param_in' 'param_in.${in_type}' &&
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
83 ln -s '$param_database' param_database.fasta &&
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
84 ## find location of the MSGFPlus.jar file of the msgf_plus conda package
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
85 MSGF_JAR=\$(msgf_plus -get_jar_path) &&
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
86
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
87 MSGFPlusAdapter
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
88 -executable \$MSGF_JAR
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
89 #if $param_in:
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
90 -in 'param_in.${in_type}'
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
91 #end if
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
92 #if $param_out:
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
93 -out $param_out
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
94 #end if
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
95 #if $param_mzid_out:
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
96 -mzid_out $param_mzid_out
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
97 #end if
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
98 #if $param_database:
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
99 -database param_database.fasta
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
100 #end if
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
101
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
102 [...]
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
103 ]]>
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
104 ```
2
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
105
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
106 * In `IDFileConverter.xml` the following is needed in the command section at the beginning (check your file to know what to copy where):
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
107
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
108 ```
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
109 <command><![CDATA[
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
110
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
111 ## check input file type
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
112 #set $in_type = $param_in.ext
0
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
113
2
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
114 ## create the symlinks to set the proper file extension, since IDFileConverter uses them to choose how to handle the input files
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
115 ln -s '$param_in' 'param_in.${in_type}' &&
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
116
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
117 IDFileConverter
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
118
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
119 #if $param_in:
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
120 -in 'param_in.${in_type}'
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
121 #end if
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
122
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
123 [...]
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
124 ]]>
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
125 ```
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
126
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
127 * In `IDFileConverter.xml` and `FileConverter.xml` add `auto_format="true"` to the output, e.g.:
0
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
128
2
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
129 - `<data name="param_out" auto_format="true"/>`
d6878d27f051 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit 50c26f7fbe8a2bd1347c860d7a62480865efc254
galaxyp
parents: 1
diff changeset
130 - `<data name="param_out" metadata_source="param_in" auto_format="true"/>`
0
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
131
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
132 * To add an example test case to `DecoyDatabase.xml` add the following after the output section. If standard settings change you might have to adjust the options and/or the test files.
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
133
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
134 ```
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
135 <tests>
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
136 <test>
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
137 <param name="param_in" value="DecoyDatabase_input.fasta"/>
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
138 <output name="param_out" file="DecoyDatabase_output.fasta"/>
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
139 </test>
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
140 </tests>
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
141 ```
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
142
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
143
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
144 * These tools have multiple outputs (number of inputs = number of outputs) which is not yet supported in Galaxy-stable and are therefore in `SKIP_TOOLS_FILES.txt`:
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
145 * SeedListGenerator
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
146 * SpecLibSearcher
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
147 * MapAlignerIdentification
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
148 * MapAlignerPoseClustering
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
149 * MapAlignerSpectrum
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
150 * MapAlignerRTTransformer
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
151
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
152 * Additionally cause of lacking dependencies, the following adapters have been removed in `SKIP_TOOLS_FILES.txt` as well:
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
153 * OMSSAAdapter
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
154 * MyrimatchAdapter
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
155
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
156 * Additionally cause of a problematic parameter (-model_directory), the following adapter has been removed:
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
157 * PepNovoAdapter
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
158
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
159
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
160 Licence (MIT)
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
161 =============
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
162
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
163 Permission is hereby granted, free of charge, to any person obtaining a copy
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
164 of this software and associated documentation files (the "Software"), to deal
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
165 in the Software without restriction, including without limitation the rights
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
166 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
167 copies of the Software, and to permit persons to whom the Software is
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
168 furnished to do so, subject to the following conditions:
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
169
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
170 The above copyright notice and this permission notice shall be included in
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
171 all copies or substantial portions of the Software.
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
172
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
173 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
174 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
175 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
176 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
177 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
178 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
179 THE SOFTWARE.
fa19593551c6 planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/openms commit fb85d488133bb2b5f483b52b2db0ac66038fafb8
galaxyp
parents:
diff changeset
180