Skip to content

Commit

Permalink
Merge branch 'master' into Pep3
Browse files Browse the repository at this point in the history
  • Loading branch information
trishorts authored Aug 27, 2024
2 parents 41f1011 + 30e73f0 commit 6359c3d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public override string ToString()

public override string ToProseString()
{
return (Tolerance.ToString() + " around " + String.Join(",", AcceptableSortedMassShifts) + " Da");
return (Tolerance.ToString() + " around " + String.Join(", ", AcceptableSortedMassShifts) + " Da");
}
}
}
}
7 changes: 4 additions & 3 deletions MetaMorpheus/TaskLayer/MetaMorpheusTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -572,12 +572,13 @@ public MyTaskResults RunTask(string output_folder, List<DbForTask> currentProtei
using (StreamWriter file = new StreamWriter(proseFilePath))
{
file.WriteLine("The data analysis was performed using MetaMorpheus version " + GlobalVariables.MetaMorpheusVersion + ", available at " + "https://github.com/smith-chem-wisc/MetaMorpheus.");
file.WriteLine();
file.Write(ProseCreatedWhileRunning.ToString());
file.WriteLine(SystemInfo.SystemProse().Replace(Environment.NewLine, "") + " ");
file.WriteLine();
file.WriteLine("The total time to perform the " + TaskType + " task on " + currentRawDataFilepathList.Count + " spectra file(s) was " + String.Format("{0:0.00}", MyTaskResults.Time.TotalMinutes) + " minutes.");
file.WriteLine();
file.WriteLine("Published works using MetaMorpheus software are encouraged to cite: Solntsev, S. K.; Shortreed, M. R.; Frey, B. L.; Smith, L. M. Enhanced Global Post-translational Modification Discovery with MetaMorpheus. Journal of Proteome Research. 2018, 17 (5), 1844-1851.");

file.WriteLine("Published works using MetaMorpheus software are encouraged to cite the appropriate publications listed in the reference guide, found here: https://github.com/smith-chem-wisc/MetaMorpheus/blob/master/README.md.");
file.WriteLine();
file.WriteLine("Spectra files: ");
file.WriteLine(string.Join(Environment.NewLine, currentRawDataFilepathList.Select(b => '\t' + b)));
Expand Down Expand Up @@ -1224,4 +1225,4 @@ protected static void SanitizeProteinDatabase(List<Protein> proteins, TargetCont
}
}
}
}
}

0 comments on commit 6359c3d

Please sign in to comment.