-
Notifications
You must be signed in to change notification settings - Fork 494
PWGHF: Merge devrun5 (ALICE 3 development for J/ψ and X) #6695
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
Merged
Merged
Changes from all commits
Commits
Show all changes
45 commits
Select commit
Hold shift + click to select a range
47051a5
first version of X candidate creator
rspijkers ab09395
Add first version of X selector
rspijkers 95999d4
delete duplicate code in HFSecondaryVertex
rspijkers 37929a2
deleted some more duplicated code...
rspijkers a46d600
add chi2PCA for X, (#6314)
rspijkers 9ec14dd
add ct and Y histos for X (#6315)
rspijkers 3dd5155
Add RICH information for Jpsi analysis (#6316)
ginnocen 7778f4b
Fix Clang
b028c45
add Ct, Y, and chi2PCA to jpsi task (#6317)
rspijkers 96a292c
Add chi2PCA selection
6607ed4
adjust histogram ranges
21d0728
Clang
f4239ec
Add MID and RICH in TrackSelectorPID (#6333)
vkucera a37b9cb
Add J/ψ → μ+ μ− matching (#6341)
vkucera 2eff73e
Add muon channel in the skim (#6342)
ginnocen fc730bf
Apply soft track selection (#6343)
vkucera 10f0702
Add J/ψ → μ+ μ− selection in selector (#6350)
vkucera b2cae9b
Fix selector to allow compatibility with MID (#6356)
ginnocen f4f8d6f
fix name (#6377)
ginnocen eae1944
Adjust mass histogram according to channel (#6378)
ginnocen cfadd8e
Clang (#6379) (#6380)
ginnocen acfacb8
Add task to check contaminations (#6401)
ginnocen 56c34e1
Add study for particle ration and PID contamination (#6404)
ginnocen 88e6d27
Fix name (#6405)
ginnocen f5a9580
Fix name (#6406)
ginnocen 92f77c6
Fix track PID for cases where RICH or MID is not available (#6407)
vkucera 8aa2dd5
Add e/pi selection (#6410)
vkucera f64148b
Simplify selector initialisation
vkucera aa23746
Add comparison of e/pi selections
vkucera 4c3686b
Restrict pion rejection by RICH to 2 GeV/c
vkucera 8dd1aea
Add e/pi selection in Jpsi selector
vkucera 3be908b
Add 2D histograms for pt jpsi vs pt daughter (#6374)
zhangbiao-phy f32400f
Fix missing ; (#6429)
vkucera 51e312c
Fix selection on MID, only PIDAccepted kept (#6448)
ginnocen 6349cc3
Propagate fixed MID sel (#6449)
ginnocen 7b76935
propagate changes (#6450)
ginnocen 03d92c2
Split J/ψ selector to ALICE 2 and 3 (#6520)
vkucera d45ef4b
Add columns to store decision of each J/ψ selector step (#6548)
vkucera fbc8831
Merge remote-tracking branch 'upstream/dev' into devrun5
vkucera b290d4d
Add Jpsi -> mumu to skimming
vkucera 81e5af6
Fix missing mass array
vkucera 6d82ee4
Fix copyright headers and braces
vkucera da5e5ce
Merge branch 'dev' into devrun5
vkucera 1cf7cdc
Introduce changes from dev
vkucera f7c16d7
Fix process selection
vkucera File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // Copyright 2019-2020 CERN and copyright holders of ALICE O2. | ||
| // See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. | ||
| // All rights not expressly granted are reserved. | ||
| // | ||
| // This software is distributed under the terms of the GNU General Public | ||
| // License v3 (GPL Version 3), copied verbatim in the file "COPYING". | ||
| // | ||
| // In applying this license CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
|
|
||
| /// | ||
| /// \file MID.h | ||
| /// \author Vít Kučera | ||
| /// \note Based on RICH.h | ||
| /// \brief Set of tables for the ALICE3 MID information | ||
| /// | ||
|
|
||
| #ifndef O2_ANALYSIS_ALICE3_MID_H_ | ||
| #define O2_ANALYSIS_ALICE3_MID_H_ | ||
|
|
||
| // O2 includes | ||
| #include "Framework/AnalysisDataModel.h" | ||
|
|
||
| namespace o2::aod | ||
| { | ||
| namespace alice3mid | ||
| { | ||
| DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! | ||
| DECLARE_SOA_INDEX_COLUMN(Track, track); //! | ||
| DECLARE_SOA_COLUMN(MIDIsMuon, midIsMuon, uint8_t); //! FIXME: To be changed to bool once bool columns are groupable. | ||
| } // namespace alice3mid | ||
|
|
||
| DECLARE_SOA_TABLE(MIDs, "AOD", "MID", //! | ||
| o2::soa::Index<>, | ||
| alice3mid::CollisionId, | ||
| alice3mid::TrackId, | ||
| alice3mid::MIDIsMuon); | ||
|
|
||
| using MID = MIDs::iterator; | ||
|
|
||
| } // namespace o2::aod | ||
|
|
||
| #endif // O2_ANALYSIS_ALICE3_MID_H_ |
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As a general comment I would try to code things so that you bail out as soon as possible. In this particular case:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hi @ktf, from what Vit told me, there is still an issue when trying to run the Jpsi/X analysis with Run2/3 data that is investigating that could be even a more general problem. Therefore, he also agrees to go ahead and merge it. Thanks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed, thanks.