Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1 - Update Mzlib to 1.0.547 (Omics Update) #2334

Merged
merged 15 commits into from
Feb 14, 2024

Conversation

nbollis
Copy link
Contributor

@nbollis nbollis commented Jan 18, 2024

A vast majority of the files changed is just changing using statements at the top. The rest are noted below

IndexingEngine.cs
-- Default product no longer exists, instread changed to code to check for null

Tweaked TomlConfig to ignore new fields in DigestionParams, enabling old toml's to be read in and written

Changed many property names to match new Interfaces

MatchedFragmentIon constructor changed to exclude the ref on first parameter. This change was made due to the Product class changing from a struct, which is passed by value, to a class, which is automatically passed by reference.

Copy link

codecov bot commented Jan 18, 2024

Codecov Report

Attention: 13 lines in your changes are missing coverage. Please review.

Comparison is base (da174f0) 92.68% compared to head (cbb2956) 92.65%.
Report is 1 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2334      +/-   ##
==========================================
- Coverage   92.68%   92.65%   -0.03%     
==========================================
  Files         136      137       +1     
  Lines       21302    21274      -28     
  Branches     2924     2928       +4     
==========================================
- Hits        19744    19712      -32     
+ Misses       1086     1083       -3     
- Partials      472      479       +7     
Files Coverage Δ
...s/EngineLayer/ClassicSearch/ClassicSearchEngine.cs 97.84% <ø> (ø)
...gineLayer/ClassicSearch/MiniClassicSearchEngine.cs 92.14% <ø> (ø)
MetaMorpheus/EngineLayer/CommonParameters.cs 95.05% <ø> (ø)
...gineLayer/CrosslinkSearch/CrosslinkSearchEngine.cs 91.08% <ø> (ø)
...ineLayer/CrosslinkSearch/CrosslinkSpectralMatch.cs 96.35% <ø> (ø)
...EngineLayer/CrosslinkSearch/CrosslinkedPeptides.cs 100.00% <ø> (ø)
...orpheus/EngineLayer/CrosslinkSearch/Crosslinker.cs 85.83% <ø> (ø)
...pheus/EngineLayer/FdrAnalysis/FdrAnalysisEngine.cs 91.42% <100.00%> (+0.04%) ⬆️
...EngineLayer/FdrAnalysis/PEPValueAnalysisGeneric.cs 95.96% <ø> (ø)
MetaMorpheus/EngineLayer/GlobalVariables.cs 84.83% <ø> (ø)
... and 56 more

... and 1 file with indirect coverage changes

@@ -258,9 +260,19 @@ private void AddInteriorTerminalModsToPrecursorIndex(List<int>[] precursorIndex,
foreach (KeyValuePair<int, List<Modification>> relevantDatabaseMod in databaseAnnotatedMods)
{
int fragmentNumber = relevantDatabaseMod.Key;
Product fragmentAtIndex = fragmentMasses.Where(x => x.FragmentNumber == fragmentNumber).FirstOrDefault();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the previous version, default Proudct would produce an a1 product with a mass of 0.0

@nbollis nbollis changed the title Update Mzlib to 1.0.548 (Omics Update) #1 - Update Mzlib to 1.0.548 (Omics Update) Jan 23, 2024
@nbollis nbollis added the dependencies Pull requests that update a dependency file label Feb 9, 2024
@@ -162,7 +163,7 @@ public static List<MatchedFragmentIon> MatchFragmentIons(Ms2ScanWithSpecificMass

if (commonParameters.ProductMassTolerance.Within(scan.TheScan.MassSpectrum.XArray[closestMzIndex], theoreticalFragmentMz))
{
matchedFragmentIons.Add(new MatchedFragmentIon(ref product, theoreticalFragmentMz, scan.TheScan.MassSpectrum.YArray[closestMzIndex], 1));
matchedFragmentIons.Add(new MatchedFragmentIon(product, theoreticalFragmentMz, scan.TheScan.MassSpectrum.YArray[closestMzIndex], 1));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

explain the elimination of the ref keyword

Copy link
Contributor

@trishorts trishorts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good. please add an explanation to the PR description about why the ref keyword left the building

trishorts and others added 2 commits February 12, 2024 13:46
* reverted filtering method for psms passed to FlashLFQ

* refactor glycospsmwriter and split from xlwriter

* fix unit tests

* rename N and O glyco test classes

* refactor is patially working

* files written to correct directory

* now with glyco protein parsimony and writing all quantified proteins

* nglycoBugged

* n glyco output is correct now i think

* yo

* fix unit tests

* fix more unit tests

* dont need glyco stuff in writexl anymore

* n glyco individual file unit test

---------

Co-authored-by: Alex <AlexSolivais@gmail.com>
Co-authored-by: MICHAEL SHORTREED <mrshortreed@wisc.edu>
@nbollis nbollis changed the title #1 - Update Mzlib to 1.0.548 (Omics Update) #1 - Update Mzlib to 1.0.549 (Omics Update) Feb 14, 2024
@nbollis nbollis merged commit 57cb82d into smith-chem-wisc:master Feb 14, 2024
3 checks passed
@nbollis nbollis changed the title #1 - Update Mzlib to 1.0.549 (Omics Update) #1 - Update Mzlib to 1.0.547 (Omics Update) Mar 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants