Merge branch 'master' into TranscriptomicsUpdate

smith-chem-wisc · Oct 23, 2024 · 372f176 · 372f176
2 parents 351e9f0 + 6c18e9f
commit 372f176
Show file tree

Hide file tree

Showing 40 changed files with 4,678 additions and 62 deletions.
diff --git a/mzLib/Chemistry/ClassExtensions.cs b/mzLib/Chemistry/ClassExtensions.cs
@@ -48,6 +48,7 @@ public static double ToMass(this double massToChargeRatio, int charge)
             return Math.Abs(charge) * massToChargeRatio - charge * Constants.ProtonMass;
         }
 
+        public static double? RoundedDouble(this double myNumber, int places = 9) => RoundedDouble(myNumber as double?, places);
         public static double? RoundedDouble(this double? myNumber, int places = 9)
         {
             if (myNumber != null)

diff --git a/mzLib/MassSpectrometry/Enums/DissociationType.cs b/mzLib/MassSpectrometry/Enums/DissociationType.cs
@@ -109,6 +109,11 @@ public enum DissociationType
         /// </summary>
         LowCID,
 
+        /// <summary>
+        /// activated ion electron photo detachment dissociation
+        /// </summary>
+        aEPD,
+
         Unknown,
         AnyActivationType,
         Custom,

diff --git a/mzLib/MzLibUtil/MzLibException.cs b/mzLib/MzLibUtil/MzLibException.cs
@@ -3,11 +3,6 @@
 namespace MzLibUtil
 {
     [Serializable]
-    public class MzLibException : Exception
-    {
-        public MzLibException(string message)
-            : base(message)
-        {
-        }
-    }
+    public class MzLibException(string message, Exception innerException = null) 
+        : Exception(message, innerException);
 }
diff --git a/mzLib/Omics/Fragmentation/FragmentationTerminus.cs b/mzLib/Omics/Fragmentation/FragmentationTerminus.cs
@@ -1,19 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Omics.Fragmentation
+namespace Omics.Fragmentation
 {
     public enum FragmentationTerminus
-        {
-            Both, //N- and C-terminus
-            N, //N-terminus only
-            C, //C-terminus only
+    {
+        Both, //N- and C-terminus
+        N, //N-terminus only
+        C, //C-terminus only
         None, //used for internal fragments, could be used for top down intact mass?
         FivePrime, // 5' for NucleicAcids
         ThreePrime, // 3' for NucleicAcids
-        }
-
+    }
 }
diff --git a/mzLib/Omics/Fragmentation/Oligo/DissociationTypeCollection.cs b/mzLib/Omics/Fragmentation/Oligo/DissociationTypeCollection.cs
diff --git a/mzLib/Omics/Fragmentation/Oligo/TerminusSpecificProductTypes.cs b/mzLib/Omics/Fragmentation/Oligo/TerminusSpecificProductTypes.cs
@@ -0,0 +1,141 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Omics.Fragmentation.Oligo
+{
+    public static class TerminusSpecificProductTypes
+    {
+        public static List<ProductType> GetRnaTerminusSpecificProductTypes(
+            this FragmentationTerminus fragmentationTerminus)
+        {
+            return ProductIonTypesFromSpecifiedTerminus[fragmentationTerminus];
+        }
+
+        /// <summary>
+        /// The types of ions that can be generated from an oligo fragment, based on the terminus of the fragment
+        /// </summary>
+        public static Dictionary<FragmentationTerminus, List<ProductType>> ProductIonTypesFromSpecifiedTerminus = new Dictionary<FragmentationTerminus, List<ProductType>>
+        {
+            { 
+                FragmentationTerminus.FivePrime, new List<ProductType>
+                {
+                    ProductType.a, ProductType.aWaterLoss, ProductType.aBaseLoss,
+                    ProductType.b, ProductType.bWaterLoss, ProductType.bBaseLoss,
+                    ProductType.c, ProductType.cWaterLoss, ProductType.cBaseLoss,
+                    ProductType.d, ProductType.dWaterLoss, ProductType.dBaseLoss,
+                }
+            },
+            { 
+                FragmentationTerminus.ThreePrime, new List<ProductType>
+                {
+                    ProductType.w, ProductType.wWaterLoss, ProductType.wBaseLoss,
+                    ProductType.x, ProductType.xWaterLoss, ProductType.xBaseLoss,
+                    ProductType.y, ProductType.yWaterLoss, ProductType.yBaseLoss,
+                    ProductType.z, ProductType.zWaterLoss, ProductType.zBaseLoss,
+                }
+            },
+            { 
+                FragmentationTerminus.Both, new List<ProductType>
+                {
+
+                    ProductType.a, ProductType.aWaterLoss, ProductType.aBaseLoss,
+                    ProductType.b, ProductType.bWaterLoss, ProductType.bBaseLoss,
+                    ProductType.c, ProductType.cWaterLoss, ProductType.cBaseLoss,
+                    ProductType.d, ProductType.dWaterLoss, ProductType.dBaseLoss,
+                    ProductType.w, ProductType.wWaterLoss, ProductType.wBaseLoss,
+                    ProductType.x, ProductType.xWaterLoss, ProductType.xBaseLoss,
+                    ProductType.y, ProductType.yWaterLoss, ProductType.yBaseLoss,
+                    ProductType.z, ProductType.zWaterLoss, ProductType.zBaseLoss,
+                    ProductType.M
+                }
+
+            },
+            { 
+                FragmentationTerminus.None, new List<ProductType>()
+            }
+        };
+
+
+        public static FragmentationTerminus GetRnaTerminusType(this ProductType fragmentType)
+        {
+            switch (fragmentType)
+            {
+                case ProductType.a:
+                case ProductType.aWaterLoss:
+                case ProductType.aBaseLoss:
+                case ProductType.b:
+                case ProductType.bWaterLoss:
+                case ProductType.bBaseLoss:
+                case ProductType.c:
+                case ProductType.cWaterLoss:
+                case ProductType.cBaseLoss:
+                case ProductType.d:
+                case ProductType.dWaterLoss:
+                case ProductType.dBaseLoss:
+                case ProductType.w:
+                case ProductType.wWaterLoss:
+                case ProductType.wBaseLoss:
+                case ProductType.x:
+                case ProductType.xWaterLoss:
+                case ProductType.xBaseLoss:
+                case ProductType.y:
+                case ProductType.yWaterLoss:
+                case ProductType.yBaseLoss:
+                case ProductType.z:
+                case ProductType.zWaterLoss:
+                case ProductType.zBaseLoss:
+                case ProductType.M:
+                    return ProductTypeToFragmentationTerminus[fragmentType];
+
+                case ProductType.aStar:
+                case ProductType.aDegree:
+                case ProductType.bAmmoniaLoss:
+                case ProductType.yAmmoniaLoss:
+                case ProductType.zPlusOne:
+                case ProductType.D:
+                case ProductType.Ycore:
+                case ProductType.Y:
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fragmentType), fragmentType, null);
+            }
+        }
+
+
+        /// <summary>
+        /// The terminus of the oligo fragment that the product ion is generated from
+        /// </summary>
+        public static Dictionary<ProductType, FragmentationTerminus> ProductTypeToFragmentationTerminus = new Dictionary<ProductType, FragmentationTerminus>
+        {
+            { ProductType.a, FragmentationTerminus.FivePrime },
+            { ProductType.aWaterLoss, FragmentationTerminus.FivePrime },
+            { ProductType.aBaseLoss, FragmentationTerminus.FivePrime },
+            { ProductType.b, FragmentationTerminus.FivePrime },
+            { ProductType.bWaterLoss, FragmentationTerminus.FivePrime },
+            { ProductType.bBaseLoss, FragmentationTerminus.FivePrime },
+            { ProductType.c, FragmentationTerminus.FivePrime },
+            { ProductType.cWaterLoss, FragmentationTerminus.FivePrime },
+            { ProductType.cBaseLoss, FragmentationTerminus.FivePrime },
+            { ProductType.d, FragmentationTerminus.FivePrime },
+            { ProductType.dWaterLoss, FragmentationTerminus.FivePrime },
+            { ProductType.dBaseLoss, FragmentationTerminus.FivePrime },
+
+            { ProductType.w, FragmentationTerminus.ThreePrime },
+            { ProductType.wWaterLoss, FragmentationTerminus.ThreePrime },
+            { ProductType.wBaseLoss, FragmentationTerminus.ThreePrime },
+            { ProductType.x, FragmentationTerminus.ThreePrime },
+            { ProductType.xWaterLoss, FragmentationTerminus.ThreePrime },
+            { ProductType.xBaseLoss, FragmentationTerminus.ThreePrime },
+            { ProductType.y, FragmentationTerminus.ThreePrime },
+            { ProductType.yWaterLoss, FragmentationTerminus.ThreePrime },
+            { ProductType.yBaseLoss, FragmentationTerminus.ThreePrime },
+            { ProductType.z, FragmentationTerminus.ThreePrime },
+            { ProductType.zWaterLoss, FragmentationTerminus.ThreePrime },
+            { ProductType.zBaseLoss, FragmentationTerminus.ThreePrime },
+
+            { ProductType.M, FragmentationTerminus.Both }
+        };
+    }
+}
diff --git a/mzLib/Omics/IBioPolymerWithSetMods.cs b/mzLib/Omics/IBioPolymerWithSetMods.cs
@@ -50,7 +50,16 @@ public void Fragment(DissociationType dissociationType, FragmentationTerminus fr
         public void FragmentInternally(DissociationType dissociationType, int minLengthOfFragments,
             List<Product> products);
 
-        public IBioPolymerWithSetMods Localize(int j, double massToLocalize);
+        /// <summary>
+        /// Outputs a duplicate IBioPolymerWithSetMods with a localized mass shift, replacing a modification when present
+        /// <remarks>
+        /// Used to localize an unknown mass shift in the MetaMorpheus Localization Engine
+        /// </remarks>
+        /// </summary>
+        /// <param name="indexOfMass">The index of the modification in the AllModOneIsNTerminus Dictionary - 2 (idk why -2)</param>
+        /// <param name="massToLocalize">The mass to add to the BioPolymer</param>
+        /// <returns></returns>
+        public IBioPolymerWithSetMods Localize(int indexOfMass, double massToLocalize);
 
         public static string GetBaseSequenceFromFullSequence(string fullSequence)
         {

diff --git a/mzLib/Proteomics/ProteolyticDigestion/PeptideWithSetModifications.cs b/mzLib/Proteomics/ProteolyticDigestion/PeptideWithSetModifications.cs
@@ -613,17 +613,17 @@ public void FragmentInternally(DissociationType dissociationType, int minLengthO
             }
         }
 
-        public IBioPolymerWithSetMods Localize(int j, double massToLocalize)
+        public IBioPolymerWithSetMods Localize(int indexOfMass, double massToLocalize)
         {
             var dictWithLocalizedMass = new Dictionary<int, Modification>(AllModsOneIsNterminus);
             double massOfExistingMod = 0;
-            if (dictWithLocalizedMass.TryGetValue(j + 2, out Modification modToReplace))
+            if (dictWithLocalizedMass.TryGetValue(indexOfMass + 2, out Modification modToReplace))
             {
                 massOfExistingMod = (double)modToReplace.MonoisotopicMass;
-                dictWithLocalizedMass.Remove(j + 2);
+                dictWithLocalizedMass.Remove(indexOfMass + 2);
             }
 
-            dictWithLocalizedMass.Add(j + 2, new Modification(_locationRestriction: "Anywhere.", _monoisotopicMass: massToLocalize + massOfExistingMod));
+            dictWithLocalizedMass.Add(indexOfMass + 2, new Modification(_locationRestriction: "Anywhere.", _monoisotopicMass: massToLocalize + massOfExistingMod));
 
             var peptideWithLocalizedMass = new PeptideWithSetModifications(Protein, _digestionParams, OneBasedStartResidueInProtein, OneBasedEndResidueInProtein,
                 CleavageSpecificityForFdrCategory, PeptideDescription, MissedCleavages, dictWithLocalizedMass, NumFixedMods);

diff --git a/mzLib/Test/Test.csproj b/mzLib/Test/Test.csproj
@@ -497,6 +497,24 @@
     </None>
     <None Update="FileReadingTests\SearchResults\VariantCrossTest.psmtsv">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Transcriptomics\TestData\20mer1.fasta">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Transcriptomics\TestData\20mer1.fasta.gz">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Transcriptomics\TestData\20mer1.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Transcriptomics\TestData\20mer1.xml.gz">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Transcriptomics\TestData\ModomicsUnmodifiedTrimmed.fasta">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Transcriptomics\TestData\ModomicsUnmodifiedTrimmed.fasta.gz">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
 	<None Update="DataFiles\centroid_1x_MS1_4x_autoMS2.d\**">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/mzLib/Test/Transcriptomics/TestData/20mer1.fasta b/mzLib/Test/Transcriptomics/TestData/20mer1.fasta
@@ -0,0 +1,2 @@
+>id:2|Name:20mer1|SOterm:20mer1|Type:tRNA|Subtype:Ala|Feature:VGC|Cellular_Localization:freezer|Species:standard
+GUACUGCCUCUAGUGAAGCA
diff --git a/mzLib/Test/Transcriptomics/TestData/20mer1.fasta.gz b/mzLib/Test/Transcriptomics/TestData/20mer1.fasta.gz
diff --git a/mzLib/Test/Transcriptomics/TestData/20mer1.xml b/mzLib/Test/Transcriptomics/TestData/20mer1.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mzLibProteinDb>
+  <entry>
+    <accession>20mer1</accession>
+    <name>20mer1</name>
+    <protein>
+      <recommendedName>
+        <fullName>20mer1</fullName>
+      </recommendedName>
+    </protein>
+    <gene />
+    <organism>
+      <name type="scientific">standard</name>
+    </organism>
+    <sequence length="20">GUACUGCCUCUAGUGAAGCA</sequence>
+  </entry>
+</mzLibProteinDb>
diff --git a/mzLib/Test/Transcriptomics/TestData/20mer1.xml.gz b/mzLib/Test/Transcriptomics/TestData/20mer1.xml.gz
diff --git a/mzLib/Test/Transcriptomics/TestData/ModomicsUnmodifiedTrimmed.fasta b/mzLib/Test/Transcriptomics/TestData/ModomicsUnmodifiedTrimmed.fasta
@@ -0,0 +1,10 @@
+>id:1|Name:tdbR00000010|SOterm:SO:0000254|Type:tRNA|Subtype:Ala|Feature:VGC|Cellular_Localization:prokaryotic cytosol|Species:Escherichia coli
+GGGGCUAUAGCUCAGCUGGGAGAGCGCCUGCUUUGCACGCAGGAGGUCUGCGGUUCGAUCCCGCAUAGCUCCACCA
+>id:2|Name:tdbR00000008|SOterm:SO:0000254|Type:tRNA|Subtype:Ala|Feature:GGC|Cellular_Localization:prokaryotic cytosol|Species:Escherichia coli
+GGGGCUAUAGCUCAGCUGGGAGAGCGCUUGCAUGGCAUGCAAGAGGUCAGCGGUUCGAUCCCGCUUAGCUCCACCA
+>id:3|Name:tdbR00000356|SOterm:SO:0001036|Type:tRNA|Subtype:Arg|Feature:ICG|Cellular_Localization:prokaryotic cytosol|Species:Escherichia coli
+GCAUCCGUAGCUCAGCUGGAUAGAGUACUCGGCUACGAACCGAGCGGUCGGAGGUUCGAAUCCUCCCGGAUGCACCA
+>id:4|Name:tdbR00000359|SOterm:SO:0001036|Type:tRNA|Subtype:Arg|Feature:CCG|Cellular_Localization:prokaryotic cytosol|Species:Escherichia coli
+GCGCCCGUAGCUCAGCUGGAUAGAGCGCUGCCCUCCGGAGGCAGAGGUCUCAGGUUCGAAUCCUGUCGGGCGCGCCA
+>id:5|Name:tdbR00000358|SOterm:SO:0001036|Type:tRNA|Subtype:Arg|Feature:UCU|Cellular_Localization:prokaryotic cytosol|Species:Escherichia coli
+GCGCCCUUAGCUCAGUUGGAUAGAGCAACGACCUUCUAAGUCGUGGGCCGCAGGUUCGAAUCCUGCAGGGCGCGCCA
diff --git a/mzLib/Test/Transcriptomics/TestData/ModomicsUnmodifiedTrimmed.fasta.gz b/mzLib/Test/Transcriptomics/TestData/ModomicsUnmodifiedTrimmed.fasta.gz