Merged in master

Author: nbollis

MetaMorpheus/CMD/Program.cs

@@ -9,6 +9,7 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using EngineLayer.DatabaseLoading;
 using Omics.Modifications;
 using TaskLayer;
 

MetaMorpheus/EngineLayer/DatabaseLoading/DatabaseLoadingEngine.cs

@@ -0,0 +1,23 @@
+#nullable enable
+namespace EngineLayer.DatabaseLoading;
+
+public class DbForTask
+{
+    public DbForTask(string filePath, bool isContaminant, string? decoyIdentifier = null)
+    {
+        FilePath = filePath;
+        IsContaminant = isContaminant;
+        FileName = System.IO.Path.GetFileName(filePath);
+        IsSpectralLibrary = GlobalVariables.GetFileExtension(filePath).ToLowerInvariant() == ".msp";
+        DecoyIdentifier = decoyIdentifier ?? GlobalVariables.DecoyIdentifier;
+    }
+
+    public bool IsSpectralLibrary { get; }
+    public string FilePath { get; }
+    public bool IsContaminant { get; }
+    public string FileName { get; }
+    public string DecoyIdentifier { get; }
+    public int? BioPolymerCount { get; internal set; } = null;
+    public int? TargetCount { get; internal set; } = null;
+    public int? DecoyCount { get; internal set; } = null;
+}

MetaMorpheus/EngineLayer/DatabaseLoading/DbForTask.cs

@@ -22,6 +22,7 @@ namespace EngineLayer
 {
     public static class GlobalVariables
     {
+        public static string DecoyIdentifier { get; set; } = "DECOY";
         // for now, these are only used for error-checking in the command-line version.
         // compressed versions of the protein databases (e.g., .xml.gz) are also supported
         public static List<string> AcceptedDatabaseFormats { get; private set; }

MetaMorpheus/EngineLayer/GlobalVariables.cs

@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading.Tasks;
 using Transcriptomics.Digestion;
 
 namespace EngineLayer
@@ -290,6 +291,8 @@ public MetaMorpheusEngineResults Run()
             return myResults;
         }
 
+        public Task<MetaMorpheusEngineResults> RunAsync() => Task.Run(Run);
+
         /// <summary>
         /// Changes the name of the analytes from "peptide" to "proteoform" or "oligo" if the protease is set to top-down
         /// </summary>

MetaMorpheus/EngineLayer/MetaMorpheusEngine.cs

@@ -12,6 +12,7 @@ public class ProteinScoringAndFdrEngine : MetaMorpheusEngine
         private readonly bool TreatModPeptidesAsDifferentPeptides;
         private readonly bool MergeIndistinguishableProteinGroups;
         private readonly List<ProteinGroup> ProteinGroups;
+        private readonly HashSet<string> _decoyIdentifiers;
 
         public ProteinScoringAndFdrEngine(List<ProteinGroup> proteinGroups, List<SpectralMatch> newPsms, bool noOneHitWonders, bool treatModPeptidesAsDifferentPeptides, bool mergeIndistinguishableProteinGroups, CommonParameters commonParameters, List<(string fileName, CommonParameters fileSpecificParameters)> fileSpecificParameters, List<string> nestedIds) : base(commonParameters, fileSpecificParameters, nestedIds)
         {
@@ -20,6 +21,7 @@ public ProteinScoringAndFdrEngine(List<ProteinGroup> proteinGroups, List<Spectra
             NoOneHitWonders = noOneHitWonders;
             TreatModPeptidesAsDifferentPeptides = treatModPeptidesAsDifferentPeptides;
             MergeIndistinguishableProteinGroups = mergeIndistinguishableProteinGroups;
+            _decoyIdentifiers = proteinGroups.SelectMany(p => p.Proteins.Where(b => b.IsDecoy).Select(b => b.Accession.Split('_')[0])).ToHashSet();
         }
 
         protected override MetaMorpheusEngineResults RunSpecific()
@@ -31,9 +33,12 @@ protected override MetaMorpheusEngineResults RunSpecific()
             return myAnalysisResults;
         }
 
-        private static string StripDecoyIdentifier(string proteinGroupName) //we're keeping only the better scoring protein group for each target/decoy pair. to do that we need to strip decoy from the name temporarily. this is the "top-picked" method
+        private static string StripDecoyIdentifier(string proteinGroupName, HashSet<string> decoyIdentifiers) //we're keeping only the better scoring protein group for each target/decoy pair. to do that we need to strip decoy from the name temporarily. this is the "top-picked" method
         {
-            return proteinGroupName.Contains("DECOY_") ? proteinGroupName.Replace("DECOY_", "") : proteinGroupName;
+            foreach (var ident in decoyIdentifiers.Where(proteinGroupName.Contains))
+                return proteinGroupName.Replace($"{ident}_", "");
+
+            return proteinGroupName;
         }
 
         private void ScoreProteinGroups(List<ProteinGroup> proteinGroups, IEnumerable<SpectralMatch> psmList)
@@ -142,7 +147,7 @@ private List<ProteinGroup> DoProteinFdr(List<ProteinGroup> proteinGroups)
             {
                 foreach (var protein in pg.Proteins)
                 {
-                    string stippedAccession = StripDecoyIdentifier(protein.Accession); //remove "DECOY_" from the accession
+                    string stippedAccession = StripDecoyIdentifier(protein.Accession, _decoyIdentifiers); //remove "DECOY_" from the accession
 
                     if (accessionToProteinGroup.TryGetValue(stippedAccession, out List<ProteinGroup> groups))
                     {

MetaMorpheus/EngineLayer/ProteinScoringAndFdr/ProteinScoringAndFdrEngine.cs

@@ -1,9 +1,12 @@
 using System.IO;
+using EngineLayer;
+using EngineLayer.DatabaseLoading;
+using GuiFunctions;
 using TaskLayer;
 
 namespace MetaMorpheusGUI
 {
-    public class ProteinDbForDataGrid
+    public class ProteinDbForDataGrid : BaseViewModel
     {
         #region Public Constructors
 
@@ -27,17 +30,41 @@ public ProteinDbForDataGrid(DbForTask uu)
             Contaminant = uu.IsContaminant;
             FilePath = uu.FilePath;
             FileName = uu.FileName;
+            DecoyIdentifier = uu.DecoyIdentifier;
         }
 
         #endregion Public Constructors
 
         #region Public Properties
 
-        public bool Use { get; set; }
-        public bool Contaminant { get; set; }
+        private bool _use;
+        private bool _isContaminant;
+        private bool _inProgress;
+        private string _decoyIdentifier = GlobalVariables.DecoyIdentifier;
+
+        public bool Use
+        {
+            get => _use;
+            set { _use = value; OnPropertyChanged(nameof(Use)); }
+        }
+        public bool Contaminant
+        {
+            get => _isContaminant;
+            set { _isContaminant = value; OnPropertyChanged(nameof(Contaminant)); }
+        }
         public string FileName { get; private set; }
         public string FilePath { get; private set; }
-        public bool InProgress { get; private set; }
+        public bool InProgress
+        {
+            get => _inProgress;
+            private set { _inProgress = value; OnPropertyChanged(nameof(InProgress)); }
+        }
+
+        public string DecoyIdentifier
+        {
+            get => _decoyIdentifier;
+            set { _decoyIdentifier = value; OnPropertyChanged(nameof(DecoyIdentifier)); }
+        }
 
         #endregion Public Properties
 

MetaMorpheus/GUI/ForDisplayingInDataGrids/ProteinDbForDataGrid.cs

@@ -550,10 +550,11 @@
                             <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource DataGridCellStyle}" />
                         </DataGrid.CellStyle>
                         <DataGrid.Columns>
-                            <DataGridTextColumn Header="File" Binding="{Binding FileName, Mode=OneWay}" Width="250" />
-                            <DataGridTextColumn Header="File Path" Binding="{Binding FilePath, Mode=OneWay}" Width="200" />
-                            <DataGridTextColumn Header="Contaminant?" Binding="{Binding Contaminant, Mode=OneWay}" Width="250" />
-                            <DataGridCheckBoxColumn Header="Use?" Binding="{Binding Use, Mode=TwoWay}"/>
+                            <DataGridTextColumn Header="File" Binding="{Binding FileName, Mode=OneWay}" Width="366" />
+                            <DataGridTextColumn Header="File Path" Binding="{Binding FilePath, Mode=OneWay}" Width="160" />
+                            <DataGridCheckBoxColumn Header="Contaminant?" Binding="{Binding Contaminant, Mode=TwoWay}" MinWidth="90" />
+                            <DataGridCheckBoxColumn Header="Use?" Binding="{Binding Use, Mode=TwoWay}" MinWidth="80"/>
+                            <DataGridTextColumn Header="Decoy Identifier" Binding="{Binding DecoyIdentifier, Mode=TwoWay}" Width="160"/>
                         </DataGrid.Columns>
                     </DataGrid>
                 </Grid>
@@ -698,8 +699,9 @@
                                 </DataGrid.CellStyle>
                                 <DataGrid.Columns>
                                     <DataGridTextColumn Header="File" Binding="{Binding FileName, Mode=OneWay}" Width="230" />
-                                    <DataGridTextColumn Header="Contaminant?" Binding="{Binding Contaminant, Mode=OneWay}" Width="170" />
-                                    <DataGridCheckBoxColumn Header="Use?" Binding="{Binding Use, Mode=TwoWay}"/>
+                                    <DataGridCheckBoxColumn Header="Use?" Binding="{Binding Use, Mode=TwoWay}" MinWidth="40"/>
+                                    <DataGridCheckBoxColumn Header="Contaminant?" Binding="{Binding Contaminant, Mode=TwoWay}" MinWidth="90"/>
+                                    <DataGridTextColumn Header="Decoy Identifier" Binding="{Binding DecoyIdentifier, Mode=TwoWay}" Width="160" />
                                 </DataGrid.Columns>
                             </DataGrid>
                             <Button Name="MiniAddProteinDbButton" Grid.Row="0" Width="20" Height="20" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,1,1" Content="+" 

MetaMorpheus/GUI/MainWindow.xaml

@@ -22,6 +22,7 @@
 using System.Text.RegularExpressions;
 using Readers.InternalResults;
 using System.Diagnostics;
+using EngineLayer.DatabaseLoading;
 
 namespace MetaMorpheusGUI
 {
@@ -665,7 +666,8 @@ private void DatabaseOrSpectraFile_DoubleClick(object sender, MouseButtonEventAr
             }
 
             // user is probably just checking or unchecking a checkbox, don't open the file
-            if (sender is DataGridCell cell && cell.Column is DataGridCheckBoxColumn)
+            // User is double clicking the decoy ident column. 
+            if (sender is DataGridCell { Column: DataGridCheckBoxColumn } || sender is DataGridCell { Column: DataGridTextColumn, TabIndex: >= 3})
             {
                 return;
             }
@@ -986,7 +988,7 @@ private void RunAllTasks_Click(object sender, RoutedEventArgs e)
             // everything is ready to run
             EverythingRunnerEngine a = new EverythingRunnerEngine(InProgressTasks.Select(b => (b.DisplayName, b.Task)).ToList(),
                 SpectraFiles.Where(b => b.Use).Select(b => b.FilePath).ToList(),
-                ProteinDatabases.Where(b => b.Use).Select(b => new DbForTask(b.FilePath, b.Contaminant)).ToList(),
+                ProteinDatabases.Where(b => b.Use).Select(b => new DbForTask(b.FilePath, b.Contaminant, b.DecoyIdentifier)).ToList(),
                 outputFolder);
 
             var t = new Task(a.Run);
@@ -1088,31 +1090,34 @@ private void BoxWithList_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             if (!RunTasksButton.IsEnabled) return;
 
+            bool IsDatabaseOrSpectra(KeyEventArgs args) => args.OriginalSource is DataGrid;
+            bool IsTask(KeyEventArgs args) => args.OriginalSource is TreeViewItem;
+
             switch (e.Key)
             {
                 // delete selected task/db/spectra
-                case Key.Delete:
-                case Key.Back:
+                case Key.Delete when IsDatabaseOrSpectra(e) || IsTask(e):
+                case Key.Back when IsDatabaseOrSpectra(e) || IsTask(e):
                     Delete_Click(sender, e);
                     e.Handled = true;
                     break;
 
                 // move task down
-                case Key.Add:
-                case Key.OemPlus:
+                case Key.Add when IsTask(e):
+                case Key.OemPlus when IsTask(e):
                     MoveSelectedTask_Click(sender, e, false);
                     e.Handled = true;
                     break;
 
                 // move task up
-                case Key.Subtract:
-                case Key.OemMinus:
+                case Key.Subtract when IsTask(e):
+                case Key.OemMinus when IsTask(e):
                     MoveSelectedTask_Click(sender, e, true);
                     e.Handled = true;
                     break;
 
                 // copy selected task
-                case Key.C when (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control:
+                case Key.C when IsTask(e) && (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control:
                     if (sender is TreeView { SelectedItem: PreRunTask preRunTask })
                     {
                         _clipboard = preRunTask.metaMorpheusTask;
@@ -1122,7 +1127,7 @@ private void BoxWithList_PreviewKeyDown(object sender, KeyEventArgs e)
                     break;
 
                 // paste selected task 
-                case Key.V when (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control:
+                case Key.V when IsTask(e) && (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control:
                     if (sender is TreeView && _clipboard != null)
                     {
                         PreRunTasks.Add(new PreRunTask(_clipboard));
@@ -1132,7 +1137,7 @@ private void BoxWithList_PreviewKeyDown(object sender, KeyEventArgs e)
                     break;
 
                 // Duplicate Selected Task
-                case Key.D when (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control:
+                case Key.D when IsTask(e) && (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control:
                     if (sender is TreeView { SelectedItem: PreRunTask task })
                     {
                         PreRunTasks.Add(task);

MetaMorpheus/GUI/MainWindow.xaml.cs

@@ -16,6 +16,7 @@ public class GuiGlobalParams
         // User can set a custom proteome directory. Be sure to use double slashes in the path, otherwise it will not be read in properly. 
         [TomlMember(Key = "UserSpecifiedProteomeDir")]
         public string ProteomeDirectory { get; internal set; }
+        public string DecoyIdentifier { get; internal set; } = "DECOY";
 
         //Ask about protease-specific parameter recommendations
         public bool AskAboutTopDownParams { get; internal set; } = true;