PWGHF: Merge devrun5 (ALICE 3 development for J/ψ and X) by vkucera · Pull Request #6695 · AliceO2Group/AliceO2

vkucera · 2021-07-20T16:03:01Z

No description provided.

add validation plots to X cand creator remove collision table from Xtask added a whole bunch of histo's to Xtask Add first working version of MC matching Add gen. MC matching for Jpsi -> ee

Add various cuts to selector - TOF pid, CPA, daughter DCA, daughter pT - Change range of histograms in taskX.cxx change range and bins of histograms add pT dependent cuts via HFSelectorCuts.h

increase granularity for some histo's

Co-authored-by: Biao Zhang <bizhang@alicecerno2.cern.ch>

* add Ct, Y, and chi2PCA to jpsi task * fix clang

* Fix format and TPC in selector * Add MID table and functions in track selector * Add RICH in TrackSelectorPID * Add debugging messages * Define a single table for ALICE 3 PID track indices * Mute debugging messages * Accept only both accepted tracks for MID * Apply clang-format

* Add J/ψ → μ+ μ− matching * Remove mysterious std::move

* Add Muon channel in the HF skim * Clang Fix * add space back Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch>

* Fix micro to mu * Add ALICE 2/3 switch * Reshuffle ALICE 2/3 detectors * Add μ+ μ− selection column in selector * Define things when needed * Remove ee from selector names

Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch>

…oup#6407)

vkucera · 2021-07-20T16:33:42Z

You should add in the init function the element for the JPsiToMuMu channel in arrMass2Prong with twice the mass of the muon

Thanks @fgrosa , fixed.

vkucera · 2021-07-22T17:36:44Z

@jgrosseo @iarsene This can be merged.

vkucera · 2021-07-23T08:12:26Z

@sawenzel Could you please merge this as well?

iarsene · 2021-07-28T08:50:23Z

Hi @vkucera,
The fullCI crash seems to be genuine. There are some compilation errors there.

vkucera · 2021-07-30T08:22:35Z

Hi @vkucera,
The fullCI crash seems to be genuine. There are some compilation errors there.

I see. The MC daughter/mother getters have changed in the meantime.

iarsene · 2021-08-13T08:13:09Z

@vkucera
Hi, Are there any news on this PR?

ginnocen · 2021-08-13T08:25:53Z

Hi @iarsene, Vit is back from holidays today. We are planning to have a look at it asap and merge it. Sorry for the delay.
Cheers GM

ginnocen · 2021-08-14T07:32:55Z

hi @vkucera thanks for updating the PR. I see macOS errors, but to me, they seem unrelated (cc @iarsene).

vkucera · 2021-08-14T07:47:54Z

hi @vkucera thanks for updating the PR. I see macOS errors, but to me, they seem unrelated (cc @iarsene).

Hi @ginnocen , indeed, the errors seem unrelated to me too.
@iarsene Please do not merge yet, I will confirm once the output is validated as well.

ktf · 2021-08-15T07:37:03Z

Analysis/Core/include/AnalysisCore/TrackSelectorPID.h

+    if (mPdg != kMuonMinus) {
+      return Status::PIDRejected;
+    }
+    if (isValidTrackPIDMID(track)) {


As a general comment I would try to code things so that you bail out as soon as possible. In this particular case:

if (!isValidTrackPIDMID(track)) { return Status::PIDNotApplicable; // PID not applicable }

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.

Agreed, thanks.

ktf

Trusting @ginnocen on this. Merging.

…p#6695) Co-authored-by: rspijkers <rik.spijkers@gmail.com> Co-authored-by: Rik Spijkers <78484875+rspijkers@users.noreply.github.com> Co-authored-by: Gian Michele Innocenti <gminnocen@gmail.com> Co-authored-by: Biao Zhang <bizhang@alicecerno2.cern.ch> Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch> Co-authored-by: zhangbiao-phy <52267892+zhangbiao-phy@users.noreply.github.com>

rspijkers and others added 30 commits June 3, 2021 12:48

first version of X candidate creator

47051a5

add validation plots to X cand creator remove collision table from Xtask added a whole bunch of histo's to Xtask Add first working version of MC matching Add gen. MC matching for Jpsi -> ee

Add first version of X selector

ab09395

Add various cuts to selector - TOF pid, CPA, daughter DCA, daughter pT - Change range of histograms in taskX.cxx change range and bins of histograms add pT dependent cuts via HFSelectorCuts.h

delete duplicate code in HFSecondaryVertex

95999d4

deleted some more duplicated code...

37929a2

add chi2PCA for X, (AliceO2Group#6314)

a46d600

increase granularity for some histo's

add ct and Y histos for X (AliceO2Group#6315)

9ec14dd

Add RICH information for Jpsi analysis (AliceO2Group#6316)

3dd5155

Co-authored-by: Biao Zhang <bizhang@alicecerno2.cern.ch>

Fix Clang

7778f4b

add Ct, Y, and chi2PCA to jpsi task (AliceO2Group#6317)

b028c45

* add Ct, Y, and chi2PCA to jpsi task * fix clang

Add chi2PCA selection

96a292c

adjust histogram ranges

6607ed4

Clang

21d0728

Add J/ψ → μ+ μ− matching (AliceO2Group#6341)

a37b9cb

* Add J/ψ → μ+ μ− matching * Remove mysterious std::move

Add muon channel in the skim (AliceO2Group#6342)

2eff73e

* Add Muon channel in the HF skim * Clang Fix * add space back Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch>

Apply soft track selection (AliceO2Group#6343)

fc730bf

Add J/ψ → μ+ μ− selection in selector (AliceO2Group#6350)

10f0702

* Fix micro to mu * Add ALICE 2/3 switch * Reshuffle ALICE 2/3 detectors * Add μ+ μ− selection column in selector * Define things when needed * Remove ee from selector names

Fix selector to allow compatibility with MID (AliceO2Group#6356)

b2cae9b

Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch>

fix name (AliceO2Group#6377)

f4f8d6f

Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch>

Adjust mass histogram according to channel (AliceO2Group#6378)

eae1944

Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch>

Clang (AliceO2Group#6379) (AliceO2Group#6380)

cfadd8e

Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch>

Add task to check contaminations (AliceO2Group#6401)

acfacb8

Add study for particle ration and PID contamination (AliceO2Group#6404)

56c34e1

Fix name (AliceO2Group#6405)

88e6d27

Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch>

Fix name (AliceO2Group#6406)

f5a9580

Co-authored-by: Gian Michele Innocenti <ginnocen@alicecerno2.cern.ch>

Fix track PID for cases where RICH or MID is not available (AliceO2Gr…

92f77c6

…oup#6407)

Add e/pi selection (AliceO2Group#6410)

8aa2dd5

Simplify selector initialisation

f64148b

Add comparison of e/pi selections

aa23746

Restrict pion rejection by RICH to 2 GeV/c

4c3686b

Fix missing mass array

81e5af6

vkucera mentioned this pull request Jul 20, 2021

Merge Run5 AliceO2Group/Run3AnalysisValidation#272

Merged

vkucera marked this pull request as ready for review July 20, 2021 21:57

vkucera requested review from ginnocen, iarsene and jgrosseo as code owners July 20, 2021 21:57

Fix copyright headers and braces

6d82ee4

vkucera added 2 commits August 13, 2021 22:35

Merge branch 'dev' into devrun5

da5e5ce

Introduce changes from dev

1cf7cdc

ginnocen previously approved these changes Aug 14, 2021

View reviewed changes

Fix process selection

f7c16d7

vkucera dismissed ginnocen’s stale review via f7c16d7 August 14, 2021 14:14

ktf self-requested a review August 15, 2021 07:34

ktf reviewed Aug 15, 2021

View reviewed changes

ktf self-requested a review August 15, 2021 09:15

ktf approved these changes Aug 15, 2021

View reviewed changes

ktf requested review from ginnocen and removed request for ginnocen August 15, 2021 09:15

ktf merged commit 71d04e9 into AliceO2Group:dev Aug 15, 2021

vkucera deleted the devrun5 branch August 15, 2021 09:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PWGHF: Merge devrun5 (ALICE 3 development for J/ψ and X)#6695

PWGHF: Merge devrun5 (ALICE 3 development for J/ψ and X)#6695
ktf merged 45 commits intoAliceO2Group:devfrom
vkucera:devrun5

vkucera commented Jul 20, 2021

Uh oh!

vkucera commented Jul 20, 2021

Uh oh!

vkucera commented Jul 22, 2021

Uh oh!

vkucera commented Jul 23, 2021

Uh oh!

iarsene commented Jul 28, 2021

Uh oh!

vkucera commented Jul 30, 2021

Uh oh!

iarsene commented Aug 13, 2021

Uh oh!

ginnocen commented Aug 13, 2021

Uh oh!

ginnocen commented Aug 14, 2021

Uh oh!

vkucera commented Aug 14, 2021

Uh oh!

ktf Aug 15, 2021

Uh oh!

ginnocen Aug 15, 2021

Uh oh!

vkucera Aug 15, 2021

Uh oh!

ktf left a comment

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

7 participants

Conversation

vkucera commented Jul 20, 2021

Uh oh!

vkucera commented Jul 20, 2021

Uh oh!

vkucera commented Jul 22, 2021

Uh oh!

vkucera commented Jul 23, 2021

Uh oh!

iarsene commented Jul 28, 2021

Uh oh!

vkucera commented Jul 30, 2021

Uh oh!

iarsene commented Aug 13, 2021

Uh oh!

ginnocen commented Aug 13, 2021

Uh oh!

ginnocen commented Aug 14, 2021

Uh oh!

vkucera commented Aug 14, 2021

Uh oh!

ktf Aug 15, 2021

Choose a reason for hiding this comment

Uh oh!

ginnocen Aug 15, 2021

Choose a reason for hiding this comment

Uh oh!

vkucera Aug 15, 2021

Choose a reason for hiding this comment

Uh oh!

ktf left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

7 participants