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

Add automatic calibration #293

Merged
merged 40 commits into from
Aug 7, 2024
Merged

Add automatic calibration #293

merged 40 commits into from
Aug 7, 2024

Conversation

odespard
Copy link
Collaborator

No description provided.

@odespard odespard requested a review from GeorgWa July 30, 2024 08:49
@odespard odespard marked this pull request as ready for review July 30, 2024 08:49
@odespard odespard changed the base branch from main to development July 30, 2024 08:49
@odespard odespard marked this pull request as draft July 30, 2024 08:49
@odespard odespard marked this pull request as ready for review July 30, 2024 08:51
@odespard odespard added the test:e2e End to end tests will be run on PRs that carry this label. label Jul 30, 2024
@odespard odespard added test:e2e End to end tests will be run on PRs that carry this label. and removed test:e2e End to end tests will be run on PRs that carry this label. labels Jul 30, 2024
@odespard odespard added test:e2e End to end tests will be run on PRs that carry this label. and removed test:e2e End to end tests will be run on PRs that carry this label. labels Jul 30, 2024
@odespard odespard added test:e2e End to end tests will be run on PRs that carry this label. and removed test:e2e End to end tests will be run on PRs that carry this label. labels Aug 5, 2024
@odespard odespard added test:e2e End to end tests will be run on PRs that carry this label. and removed test:e2e End to end tests will be run on PRs that carry this label. labels Aug 5, 2024
@odespard odespard added test:e2e End to end tests will be run on PRs that carry this label. and removed test:e2e End to end tests will be run on PRs that carry this label. labels Aug 5, 2024
@odespard odespard requested a review from GeorgWa August 6, 2024 07:38
@odespard odespard added test:e2e End to end tests will be run on PRs that carry this label. and removed test:e2e End to end tests will be run on PRs that carry this label. labels Aug 6, 2024
@odespard odespard added test:e2e End to end tests will be run on PRs that carry this label. and removed test:e2e End to end tests will be run on PRs that carry this label. labels Aug 7, 2024
Copy link
Collaborator

@GeorgWa GeorgWa left a comment

Choose a reason for hiding this comment

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

LGTM

@odespard odespard merged commit 37ef065 into development Aug 7, 2024
9 checks passed
@odespard odespard deleted the add_automatic_calibration branch August 7, 2024 17:25
Comment on lines +98 to +113
optimization_manager_config = {
"ms1_error": self.config["search_initial"]["initial_ms1_tolerance"],
"ms2_error": self.config["search_initial"]["initial_ms2_tolerance"],
"rt_error": self.config["search_initial"]["initial_rt_tolerance"],
"mobility_error": self.config["search_initial"][
"initial_mobility_tolerance"
],
"column_type": "library",
"num_candidates": self.config["search_initial"]["initial_num_candidates"],
"classifier_version": -1,
"fwhm_rt": self.config["optimization_manager"]["fwhm_rt"],
"fwhm_mobility": self.config["optimization_manager"]["fwhm_mobility"],
"score_cutoff": self.config["optimization_manager"]["score_cutoff"],
}
self._optimization_manager = manager.OptimizationManager(
self.config["optimization_manager"],
optimization_manager_config,
Copy link
Collaborator

Choose a reason for hiding this comment

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

this seems to me like OptimizationManager-specific logic that is outside of OptimizationManager :-)
suggestion:
pass the self.config to the OptimizationManager and do this mapping during initialization. Also, I suggest separating between constant values (probable fwhm_rt does not change?) and dynamic values (e.g. classifier_version)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, that is true. I'll change it.

I think everything in the optimization manager should change – fwhm_rt for instance is updated during calibration.

@GeorgWa GeorgWa added the enhancement New feature or request label Sep 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request test:e2e End to end tests will be run on PRs that carry this label.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants