Skip to content

Commit bbdd555

Browse files
committed
Update mzml and mzidentml reading dependencies to get their performance improvements
On a test file the conversion from mzid to tsv was 4x faster Also bump the version
1 parent d3bddc4 commit bbdd555

File tree

4 files changed

+22
-64
lines changed

4 files changed

+22
-64
lines changed

doc/Changelog.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ <h1 class="pagetitle">MS-GF+ ChangeLog</h1>
1313
<a href="index.html">MS-GF+ Documentation home</a>
1414
</p>
1515

16+
<p>
17+
<b>07/21/2017 v2017.07.21</b>
18+
</p>
19+
<ul>
20+
<li>Performance improvements when reading mzML and mzIdentML files</li>
21+
</ul>
22+
1623
<p>
1724
<b>05/18/2017 v2017.05.18</b>
1825
</p>

pom.xml

Lines changed: 5 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -168,63 +168,16 @@
168168
</build>
169169
<dependencies>
170170
<dependency>
171-
<groupId>uk.ac.ebi.pride.tools</groupId>
172-
<artifactId>jmzreader</artifactId>
173-
<version>1.2.4</version>
174-
<type>jar</type>
175-
</dependency>
176-
<dependency>
177-
<groupId>uk.ac.ebi.pride.tools</groupId>
178-
<artifactId>pkl-parser</artifactId>
179-
<version>1.2.5</version>
180-
<type>jar</type>
181-
</dependency>
182-
<dependency>
183-
<groupId>uk.ac.ebi.pride.tools</groupId>
184-
<artifactId>dta-parser</artifactId>
185-
<version>1.2.5</version>
186-
<type>jar</type>
187-
</dependency>
188-
<dependency>
189-
<groupId>uk.ac.ebi.pride.tools</groupId>
190-
<artifactId>ms2-parser</artifactId>
191-
<version>1.2.6</version>
192-
<type>jar</type>
193-
</dependency>
194-
<dependency>
195-
<groupId>uk.ac.ebi.pride.tools</groupId>
196-
<artifactId>mgf-parser</artifactId>
197-
<version>1.3.8</version>
198-
<type>jar</type>
199-
</dependency>
200-
<dependency>
201-
<groupId>uk.ac.ebi.pride.tools</groupId>
202-
<artifactId>mzdata-parser</artifactId>
203-
<version>1.2.5</version>
204-
<type>jar</type>
205-
</dependency>
206-
<dependency>
207-
<groupId>uk.ac.ebi.pride.tools</groupId>
208-
<artifactId>mzml-wrapper</artifactId>
209-
<version>1.3.2</version>
210-
<type>jar</type>
171+
<groupId>uk.ac.ebi.jmzidml</groupId>
172+
<artifactId>jmzidentml</artifactId>
173+
<version>1.2.7</version>
211174
</dependency>
212175
<dependency>
213176
<groupId>uk.ac.ebi.pride.tools</groupId>
214-
<artifactId>pride-wrapper</artifactId>
215-
<version>1.2.5</version>
177+
<artifactId>jmzreader</artifactId>
178+
<version>2.0.1</version>
216179
<type>jar</type>
217180
</dependency>
218-
<dependency>
219-
<groupId>uk.ac.ebi.pride.tools</groupId>
220-
<artifactId>mzxml-parser</artifactId>
221-
<version>1.3.8</version>
222-
</dependency>
223-
<dependency>
224-
<groupId>uk.ac.ebi.jmzidml</groupId>
225-
<artifactId>jmzidentml</artifactId>
226-
<version>1.2.4</version>
227-
</dependency>
228181
<dependency>
229182
<groupId>org.systemsbiology.jrap</groupId>
230183
<artifactId>stax</artifactId>

src/main/java/edu/ucsd/msjava/mzml/MzMLAdapter.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package edu.ucsd.msjava.mzml;
22

3+
import org.slf4j.LoggerFactory;
4+
import ch.qos.logback.classic.Logger;
5+
import ch.qos.logback.classic.LoggerContext;
6+
37
import edu.ucsd.msjava.mzid.Constants;
4-
import org.apache.log4j.Level;
5-
import org.apache.log4j.LogManager;
6-
import org.apache.log4j.Logger;
78
import uk.ac.ebi.jmzidml.model.mzidml.CvParam;
89
import uk.ac.ebi.jmzml.model.mzml.CVParam;
910
import uk.ac.ebi.jmzml.model.mzml.SourceFile;
1011
import uk.ac.ebi.jmzml.xml.io.MzMLObjectIterator;
1112
import uk.ac.ebi.jmzml.xml.io.MzMLUnmarshaller;
1213

1314
import java.io.File;
14-
import java.util.Collections;
15-
import java.util.List;
1615

1716
public class MzMLAdapter {
1817

@@ -86,11 +85,10 @@ public CvParam getSpectrumIDFormatCvParam() {
8685
public static void turnOffLogs() {
8786
if (!logOff) {
8887
@SuppressWarnings("unchecked")
89-
List<Logger> loggers = Collections.<Logger>list(LogManager.getCurrentLoggers());
90-
loggers.add(LogManager.getRootLogger());
91-
for (Logger logger : loggers) {
92-
logger.setLevel(Level.OFF);
93-
}
88+
LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
89+
context.reset();
90+
Logger rootLogger = context.getLogger(Logger.ROOT_LOGGER_NAME);
91+
rootLogger.detachAndStopAllAppenders();
9492
}
9593
}
9694

src/main/java/edu/ucsd/msjava/ui/MSGFPlus.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222

2323
public class MSGFPlus {
24-
public static final String VERSION = "Release (v2017.05.18)";
25-
public static final String RELEASE_DATE = "18 May 2017";
24+
public static final String VERSION = "Release (v2017.07.21)";
25+
public static final String RELEASE_DATE = "21 July 2017";
2626

2727
public static final String DECOY_DB_EXTENSION = ".revCat.fasta";
2828
public static final String DECOY_PROTEIN_PREFIX = "XXX";

0 commit comments

Comments
 (0)