merged in master bbbyy

nbollis · Nov 5, 2024 · fea00d9 · fea00d9
1 parent e718223
commit fea00d9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 24 deletions.
diff --git a/MetaMorpheus/EngineLayer/ClassicSearch/ClassicSearchEngine.cs b/MetaMorpheus/EngineLayer/ClassicSearch/ClassicSearchEngine.cs
@@ -7,7 +7,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Omics.Fragmentation.Peptide;
 using Omics.Modifications;
 
 namespace EngineLayer.ClassicSearch
@@ -68,10 +67,6 @@ protected override MetaMorpheusEngineResults RunSpecific()
                 myLocks[i] = new object();
             }
 
-            if (CommonParameters.DissociationType == DissociationType.Custom)
-                DissociationTypeCollection.ProductsFromDissociationType[DissociationType.Custom] =
-                    CommonParameters.CustomIons;
-
             Status("Performing classic search...");
 
             if (Proteins.Any())
@@ -173,10 +168,6 @@ protected override MetaMorpheusEngineResults RunSpecific()
                 psm.ResolveAllAmbiguities();
             }
 
-            if (CommonParameters.DissociationType == DissociationType.Custom)
-                DissociationTypeCollection.ProductsFromDissociationType[DissociationType.Custom] =
-                    new List<ProductType>();
-
             return new MetaMorpheusEngineResults(this);
         }
 

diff --git a/MetaMorpheus/EngineLayer/ModernSearch/ModernSearchEngine.cs b/MetaMorpheus/EngineLayer/ModernSearch/ModernSearchEngine.cs
@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Omics.Fragmentation.Peptide;
 
 namespace EngineLayer.ModernSearch
 {
@@ -47,8 +46,6 @@ protected override MetaMorpheusEngineResults RunSpecific()
 
             int maxThreadsPerFile = CommonParameters.MaxThreadsToUsePerFile;
             int[] threads = Enumerable.Range(0, maxThreadsPerFile).ToArray();
-            if (CommonParameters.DissociationType == DissociationType.Custom)
-                DissociationTypeCollection.ProductsFromDissociationType[DissociationType.Custom] = CommonParameters.CustomIons;
 
             Parallel.ForEach(threads, (scanIndex) =>
             {
@@ -90,10 +87,6 @@ protected override MetaMorpheusEngineResults RunSpecific()
                 psm.ResolveAllAmbiguities();
             }
 
-            if (CommonParameters.DissociationType == DissociationType.Custom)
-                DissociationTypeCollection.ProductsFromDissociationType[DissociationType.Custom] =
-                    new List<ProductType>();
-
             return new MetaMorpheusEngineResults(this);
         }
 

diff --git a/MetaMorpheus/EngineLayer/NonSpecificEnzymeSearch/NonSpecificEnzymeSearchEngine.cs b/MetaMorpheus/EngineLayer/NonSpecificEnzymeSearch/NonSpecificEnzymeSearchEngine.cs
@@ -56,9 +56,6 @@ protected override MetaMorpheusEngineResults RunSpecific()
                 throw new NotImplementedException();
             }
 
-            if (CommonParameters.DissociationType == DissociationType.Custom)
-                DissociationTypeCollection.ProductsFromDissociationType[DissociationType.Custom] = CommonParameters.CustomIons;
-
             int maxThreadsPerFile = CommonParameters.MaxThreadsToUsePerFile;
             int[] threads = Enumerable.Range(0, maxThreadsPerFile).ToArray();
             Parallel.ForEach(threads, (i) =>
@@ -166,11 +163,6 @@ protected override MetaMorpheusEngineResults RunSpecific()
                     }
                 }
             });
-
-            if (CommonParameters.DissociationType == DissociationType.Custom)
-                DissociationTypeCollection.ProductsFromDissociationType[DissociationType.Custom] =
-                    new List<ProductType>();
-
             return new MetaMorpheusEngineResults(this);
         }