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

Set qcTraceName on ChromatogramGroupId #982

Merged
merged 3 commits into from
Nov 19, 2024

Conversation

vagisha
Copy link
Collaborator

@vagisha vagisha commented Nov 18, 2024

Rationale

qcTraceName is written to the skyd file but was not being set on ChromatogramGroupId in the Panorama code.
If the name of a QC trace is empty, it cannot be used to create a trace metric in QC folders (https://www.labkey.org/issues/home/Developer/issues/details.view?issueId=50773).

Related Pull Requests

Changes

@vagisha
Copy link
Collaborator Author

vagisha commented Nov 18, 2024

@nickshulman & @josheckels This PR does not set the SpectrumClassFilter on ChromatogramGroupId. Looks like that was added in this PR: #921, but it was merged with "develop" in July so it is not part of 24.7-SNAPSHOT that we just deployed on PanoramaWeb.
Should I merge Nick's changes to ChromatogramGroupId and add the new SpectrumFilter class from Nick's PR into this PR?

@labkey-jeckels
Copy link
Contributor

@vagisha yes, I think we can back port all of Nick's change to 24.7. We're lucky here that 24.7 already has 24.004 as the schema version for targetedms so there's no need to make any of the upgrades conditional.

Copy link
Contributor

@labkey-jeckels labkey-jeckels left a comment

Choose a reason for hiding this comment

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

This change looks good but I'll wait for the back port to approve

nickshulman and others added 2 commits November 18, 2024 11:30
"Spectrum Filter" gets parsed from the Skyline document
light:heavy ratios are not calculated for precursors that have a spectrum filter
The spectrum filter is used when deciding which chromatogram to read from the .skyd file for a particular precursor.
# Conflicts:
#	src/org/labkey/targetedms/parser/ChromatogramGroupId.java
@vagisha
Copy link
Collaborator Author

vagisha commented Nov 18, 2024

@labkey-jeckels changes have been backported. Waiting for tests to pass.

@vagisha vagisha merged commit e4c1920 into release24.7-SNAPSHOT Nov 19, 2024
5 checks passed
@vagisha vagisha deleted the 24.7_fb_set-qctracename branch November 19, 2024 02:33
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.

3 participants