Fix Kendrick base consistency between MSPeak and MolecularFormula#28
Open
robertyoung3 wants to merge 1 commit intoEMSL-Computing:masterfrom
Open
Fix Kendrick base consistency between MSPeak and MolecularFormula#28robertyoung3 wants to merge 1 commit intoEMSL-Computing:masterfrom
robertyoung3 wants to merge 1 commit intoEMSL-Computing:masterfrom
Conversation
55e812f to
6168b5f
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Two related fixes for Kendrick base handling:
Inconsistent default in MolecularFormulaBase: When a molecular formula has no parent peak,
__init__used a hardcoded{"C": 1, "H": 2}fallback instead of reading fromMSParameters.ms_peak.kendrick_base. This meant user-configured Kendrick bases were ignored for orphan formulas.Stale formula KMD after base change:
MSPeak.change_kendrick_base()recalculated KMD for the peak but not for its associated molecular formulas. Whenchange_kendrick_base_all_mspeaks()is called after formula assignment (as inpriorityAssignment.pyandfindOxygenPeaks.py), formulas retained stale KMD values.Changes
MolecularFormulaFactory.py
MSPeakClasses.py — added to
change_kendrick_base():Test plan
change_kendrick_base_all_mspeaks()is the canonical entry point (called inpriorityAssignment.py:273andfindOxygenPeaks.py:92)mspeak.change_kendrick_base(), which now also updates formulastests/test_mspeak.py:32exerciseschange_kendrick_base