Fix merge conflicts.#43
Open
LucasEhinger wants to merge 1 commit into
Open
Conversation
Restructure Ladhodo and lad kin --Rather than copying the goodladhits from lad hodo and having almost an exact duplicate for ladkin, the ladkin variables are removed, and ladkin only modifies the ladhod variables. Added a chi-quare and is_proton variable to the goodladhit. Accidentally auto-formatted LADKine in this commit, hence the large diff. Will attempt to break into two commits later. TODO: --Add a proton cut to ladkin. --Clean up once functionality is verified (beyond just compiling) --Other todo's in Ching Him's tracking PR
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
1 participant
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.
Restructure Ladhodo and lad kin
--Rather than copying the goodladhits from lad hodo and having almost an exact duplicate for ladkin, the ladkin variables are removed, and ladkin only modifies the ladhod variables. All final variables now live in ladhod. Added a chi-quare and is_proton variable to the goodladhit.
Accidentally auto-formatted LADKine in this commit, hence the large diff. Will attempt to break into two commits later.
TODO:
--Add a proton cut to ladkin.
--Add GEM timing cut (need to be careful with background subtraction, to not just kill sidebands)
--Other todo's in Ching Him's tracking PR