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

Fix WIFF SIM/SRM RTWindows bug #2488

Merged
merged 20 commits into from
Nov 21, 2023
Merged

Fix WIFF SIM/SRM RTWindows bug #2488

merged 20 commits into from
Nov 21, 2023

Conversation

chambm
Copy link
Member

@chambm chambm commented Feb 8, 2023

  • added automatic doubling of SIM/SRM RTWindows if a WIFF file was collected by SCIEX OS version less than 3.1 (reported by Phillip)
  • removed very old conditional code for .NET < 4

ProteoWizard installer (MSConvert/SeeMS)
SkylineTester.zip

…llected by SCIEX OS version less than 3.1 (reported by Phillip)

* removed very old conditional code for .NET < 4
…o try to get SIM/SRM chromatograms from the entire time range instead of within the scheduled limits; works around a bug(?) with Sciex WIFF where it records the wrong scheduled limits but the data is actually there if you tell it to ignore the limits (reported by Phillip and Celeste)
@chambm
Copy link
Member Author

chambm commented Mar 6, 2023

@brendanx67 I have been trying to decide whether I want to leave this ignoreScheduledLimitsForChromatograms flag as an option or make it unconditional (i.e. always return the biggest chromatogram possible for scheduled MRM data). Turning it on does break one Skyline test (TestOptimization). But I'm not actually sure what the test difference is reporting:

Diff found at line 1:
450.695949,524.246337,20,peptides1.FNDDFSR.+2y4.light,80,21.1,17.00
>
450.695949,524.246337,20,peptides1.FNDDFSR.+2y4.light,80,21.1,16.50
#    at pwiz.SkylineTestFunctional.OptimizeTest.CovOptimizationTest() in C:\dev\pwiz\pwiz_tools\Skyline\TestFunctional\OptimizeTest.cs:line 704

What is that last column? Compensation voltage?

The user that had this problem wasn't using Skyline, but if they had, they would have the same problem this new option fixes: they would not have been able to see all the data they expected to see. That's because the API's default chromatogram extraction method uses too narrow RT window boundaries for some scheduled methods. So I wonder actually how many users this has affected without them realizing it.

@chambm chambm force-pushed the bug/fix-wiff-half-size-rtwindow branch from 489631b to 64ac83d Compare May 15, 2023 18:34
chambm added 5 commits July 31, 2023 10:41
…llected by SCIEX OS version less than 3.1 (reported by Phillip)

* removed very old conditional code for .NET < 4
…o try to get SIM/SRM chromatograms from the entire time range instead of within the scheduled limits; works around a bug(?) with Sciex WIFF where it records the wrong scheduled limits but the data is actually there if you tell it to ignore the limits (reported by Phillip and Celeste)
@chambm chambm force-pushed the bug/fix-wiff-half-size-rtwindow branch from 64ac83d to 163826c Compare July 31, 2023 14:41
@nickshulman
Copy link
Contributor

@chambm,
I could not figure out how to get "TestOptimization" to fail.
I tried changing the C++ code so that "ignoreScheduledLimitsForChromatograms" was always true, and as far as I could tell, TestOptimization still passed.
If you get this pull request into a state where tests are failing, I'll try to figure out how to fix them.

@chambm
Copy link
Member Author

chambm commented Nov 14, 2023

@chambm, I could not figure out how to get "TestOptimization" to fail. I tried changing the C++ code so that "ignoreScheduledLimitsForChromatograms" was always true, and as far as I could tell, TestOptimization still passed. If you get this pull request into a state where tests are failing, I'll try to figure out how to fix them.

I'm actually getting 3 failures with ignoreScheduledLimitsForChromatograms = true in the MsDataFileImpl constructor: TestSrmTutorialLegacy,TestPeakPickingTutorial,TestAsymCEOpt

None are TestOptimization. I'm not sure what I did to cause that one.

@nickshulman
Copy link
Contributor

I think we should just update the expected values and audit log files for "TestSrmTutorialLegacy" and "TestPeakPickingTutorial".
I'll try to figure out what is going on with "TestAsymCEOpt".

Nicholas Shulman and others added 4 commits November 14, 2023 15:11
Set "ignoreScheduledLimitsForChromatograms" to true in MsDataFileImpl constructor.
Update expected values for "TestSrmTutorialLegacy" and "TestPeakPickingTutorial"
…zard/pwiz into bug/fix-wiff-half-size-rtwindow
@chambm
Copy link
Member Author

chambm commented Nov 15, 2023

If we're not considering making user-configurable in Skyline, I'm inclined to just always enable it in pwiz and remove the option. Did you determine that the new behavior is preferable for those tutorials?

I'm a bit worried that I didn't see those test failures the first time I was working on this PR and set the parameter to always be true; maybe I didn't have it set to run the tutorials, but that doesn't explain why only TestAsymCEOpt failed now and only TestOptimization failed back then.

@nickshulman
Copy link
Contributor

Did you determine that the new behavior is preferable for those tutorials?
I would not say "preferable".
The new behavior did not seem to raise any red flags.

Yes, getting rid "ignoreScheduledLimitsForChromatograms" sounds like a good idea.
I will try running the entire test suite on macs2 and make sure everything passes.

@chambm chambm merged commit 9397536 into master Nov 21, 2023
2 checks passed
@chambm chambm deleted the bug/fix-wiff-half-size-rtwindow branch November 21, 2023 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants