Skip to content

Commit 54f018b

Browse files
author
stefanks
committed
noice
1 parent ef2e41b commit 54f018b

File tree

2 files changed

+3
-29
lines changed

2 files changed

+3
-29
lines changed

TaskLayer/Parent/MetaMorpheusTask.cs

+2-28
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66
using System.Collections.Generic;
77
using System.Globalization;
88
using System.IO;
9-
using System.IO.Compression;
109
using System.Linq;
1110
using System.Text;
12-
using System.Xml;
1311

1412
namespace TaskLayer
1513
{
@@ -22,6 +20,7 @@ public enum MyTask
2220

2321
public abstract class MetaMorpheusTask : MyEngine
2422
{
23+
2524
#region Public Fields
2625

2726
public List<string> rawDataFilenameList;
@@ -267,32 +266,6 @@ private static IEnumerable<ModList> LoadMods()
267266
yield return new ModList(modFile);
268267
}
269268

270-
private static HashSet<string> ReadXmlModifications(IEnumerable<string> uniProtXmlProteomeDatabaseFilepaths)
271-
{
272-
var modifications_in_database = new HashSet<string>();
273-
foreach (var uniProtXmlProteomeDatabaseFilepath in uniProtXmlProteomeDatabaseFilepaths)
274-
using (var stream = new FileStream(uniProtXmlProteomeDatabaseFilepath, FileMode.Open))
275-
{
276-
Stream uniprotXmlFileStream = stream;
277-
if (uniProtXmlProteomeDatabaseFilepath.EndsWith(".gz", StringComparison.OrdinalIgnoreCase))
278-
uniprotXmlFileStream = new GZipStream(stream, CompressionMode.Decompress);
279-
using (XmlReader xml = XmlReader.Create(uniprotXmlFileStream))
280-
while (xml.ReadToFollowing("feature"))
281-
if (xml.GetAttribute("type") == "modified residue")
282-
{
283-
string description = xml.GetAttribute("description");
284-
if (!description.Contains("variant"))
285-
{
286-
int semicolon_index = description.IndexOf(';');
287-
if (semicolon_index >= 0)
288-
description = description.Substring(0, semicolon_index);
289-
modifications_in_database.Add(description);
290-
}
291-
}
292-
}
293-
return modifications_in_database;
294-
}
295-
296269
private void finishedSingleTask()
297270
{
298271
FinishedSingleTaskHandler?.Invoke(this, new SingleTaskEventArgs(this));
@@ -304,5 +277,6 @@ private void startingSingleTask()
304277
}
305278

306279
#endregion Private Methods
280+
307281
}
308282
}

Test/MyTaskTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using MassSpectrometry;
33
using NUnit.Framework;
44
using Proteomics;
5-
using Spectra;
65
using System;
76
using System.Collections.Generic;
87
using System.Collections.ObjectModel;
@@ -33,6 +32,7 @@ public static void TestEverythingRunner()
3332
SearchTask task3 = new SearchTask();
3433
task3.ListOfModListsLocalize.Add(MetaMorpheusTask.AllModLists.First(b => b.FileName.EndsWith("m.txt")));
3534
task3.ListOfModListsLocalize.Add(MetaMorpheusTask.AllModLists.First(b => b.FileName.EndsWith("glyco.txt")));
35+
task3.DoParsimony = true;
3636

3737
SearchTask task4 = new SearchTask();
3838
task4.ListOfModListsLocalize.Add(MetaMorpheusTask.AllModLists.First(b => b.FileName.EndsWith("m.txt")));

0 commit comments

Comments
 (0)