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.

Sign up for GitHub

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

Jump to bottom

PWGHF: Implementation of mult definition T0M and adding track selection #5661

Merged
merged 1 commit into from
Apr 19, 2024
Merged

PWGHF: Implementation of mult definition T0M and adding track selection #5661

merged 1 commit into from
Apr 19, 2024

Conversation

Simple-Shyam
Copy link
Contributor

I modified the definition for the calculation of multiplicity from V0M to T0M and also added the track selection in the task.

fcolamar
fcolamar reviewed Apr 17, 2024
View reviewed changes
Copy link
Collaborator

@fcolamar fcolamar left a comment

Choose a reason for hiding this comment

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

The updates are fine to me (my comments were posted on the parallel PR, just closed, and implemented there).
For the future, take into consideration what we just discussed internally on the most suited way of preparing commits and PR

@fcolamar fcolamar enabled auto-merge (squash) April 17, 2024 10:17
@Simple-Shyam
Copy link
Contributor Author

ake into consideration what we just discussed internally on the most suited way of prepa

Ciao Fabio, Thank you for help in solving the issue related to merge request. I will follow it in my future commits.

@fcolamar fcolamar merged commit d11c69d into AliceO2Group:master Apr 19, 2024
11 checks passed
@Simple-Shyam Simple-Shyam deleted the DplusCorrelation branch April 19, 2024 13:12
vkucera
vkucera reviewed Apr 20, 2024
View reviewed changes
PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx
@@ -77,7 +77,7 @@ struct HfCorrelatorDplusHadronsDplusSelection {
Partition<soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi, aod::HfCand3ProngMcRec>> selectedDplusCandidatesMc = aod::hf_sel_candidate_dplus::isSelDplusToPiKPi >= selectionFlagDplus;

void processDplusSelectionData(aod::Collision const& collision,
soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi> const&)
soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi> const& candidates)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do not revert fixes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What should I do here? I didn't change anything here.

Copy link
Collaborator

Choose a reason for hiding this comment

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

This is a change from your PR, so yes, you changed it, maybe by incorrectly resolving merging conflicts in your branch.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Fixed again in #5757

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you, it's done so I don't have to do anything ?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Correct

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks

PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx
@@ -99,7 +99,7 @@ struct HfCorrelatorDplusHadronsDplusSelection {
PROCESS_SWITCH(HfCorrelatorDplusHadronsDplusSelection, processDplusSelectionData, "Process Dplus Selection Data", false);

void processDplusSelectionMcRec(aod::Collision const& collision,
soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi, aod::HfCand3ProngMcRec> const&)
soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi, aod::HfCand3ProngMcRec> const& candidates)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do not revert fixes.

PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx
@@ -123,7 +123,7 @@ struct HfCorrelatorDplusHadronsDplusSelection {
}
PROCESS_SWITCH(HfCorrelatorDplusHadronsDplusSelection, processDplusSelectionMcRec, "Process Dplus Selection MCRec", false);

void processDplusSelectionMcGen(aod::McCollision const&,
void processDplusSelectionMcGen(aod::McCollision const& mcCollision,
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do not revert fixes.

PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx
soa::Join<aod::HfCand3Prong, aod::HfSelDplusToPiKPi> const&, aod::BCsWithTimestamps const&)
void processData(SelCollisionsWithDplus::iterator const& collision,
TracksWithDca const& tracks,
CandidatesDplusData const& candidates, aod::BCsWithTimestamps const&)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do not revert fixes.

PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx
@@ -438,7 +444,7 @@ struct HfCorrelatorDplusHadrons {
int counterDplusHadron = 0;
registry.fill(HIST("hMCEvtCount"), 0);

auto getTracksSize = [&mcParticles](aod::McCollision const& /*collision*/) {
auto getTracksSize = [&mcParticles](aod::McCollision const& collision) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do not revert fixes.

christianreckziegel pushed a commit to christianreckziegel/O2Physics that referenced this pull request May 2, 2024
@Simple-Shyam @christianreckziegel
PWGHF: Implementation of mult definition T0M and adding track selecti…
aa8701e 
…on (AliceO2Group#5661)
hahassan7 pushed a commit to hahassan7/O2Physics that referenced this pull request May 17, 2024
@Simple-Shyam @hahassan7
PWGHF: Implementation of mult definition T0M and adding track selecti…
2a9c71a 
…on (AliceO2Group#5661)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vkucera vkucera vkucera left review comments

@fcolamar fcolamar fcolamar approved these changes

@alibuild alibuild Awaiting requested review from alibuild alibuild is a code owner

@fgrosa fgrosa Awaiting requested review from fgrosa fgrosa is a code owner

@fcatalan92 fcatalan92 Awaiting requested review from fcatalan92 fcatalan92 is a code owner

@mfaggin mfaggin Awaiting requested review from mfaggin mfaggin is a code owner

@mmazzilli mmazzilli Awaiting requested review from mmazzilli mmazzilli is a code owner

@deepathoms deepathoms Awaiting requested review from deepathoms deepathoms is a code owner

@nzardosh nzardosh Awaiting requested review from nzardosh

@NicoleBastid NicoleBastid Awaiting requested review from NicoleBastid NicoleBastid is a code owner

@hahassan7 hahassan7 Awaiting requested review from hahassan7 hahassan7 is a code owner

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Simple-Shyam @fcolamar @vkucera