Skip to content

Commit e219b04

Browse files
Simple-ShyamSimple-Shyam
authored
Merge branch 'AliceO2Group:master' into DplusHadronCorrelation
2 parents 6e4ecc4 + 5b64451 commit e219b04

File tree

83 files changed

+8037
-5025
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+8037
-5025
lines changed

‎ALICE3/TableProducer/alice3-multicharm.cxx‎

Lines changed: 92 additions & 37 deletions
Large diffs are not rendered by default.

‎Common/TableProducer/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ add_subdirectory(PID)
1414

1515
o2physics_add_dpl_workflow(trackextension
1616
SOURCES trackextension.cxx
17-
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DetectorsBase
17+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
1818
COMPONENT_NAME Analysis)
1919

2020
o2physics_add_dpl_workflow(trackselection
@@ -59,12 +59,12 @@ o2physics_add_dpl_workflow(ft0-corrected-table
5959

6060
o2physics_add_dpl_workflow(track-propagation
6161
SOURCES trackPropagation.cxx
62-
PUBLIC_LINK_LIBRARIES O2::DetectorsBase O2Physics::AnalysisCore
62+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
6363
COMPONENT_NAME Analysis)
6464

6565
o2physics_add_dpl_workflow(track-propagation-tester
6666
SOURCES trackPropagationTester.cxx
67-
PUBLIC_LINK_LIBRARIES O2::DetectorsBase O2Physics::AnalysisCore O2Physics::trackSelectionRequest
67+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::trackSelectionRequest
6868
COMPONENT_NAME Analysis)
6969

7070
o2physics_add_dpl_workflow(calo-clusters
@@ -92,7 +92,7 @@ o2physics_add_dpl_workflow(fwdtrack-to-collision-associator
9292

9393
o2physics_add_dpl_workflow(mccollisionextra
9494
SOURCES mcCollsExtra.cxx
95-
PUBLIC_LINK_LIBRARIES O2::DetectorsBase O2Physics::AnalysisCore
95+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
9696
COMPONENT_NAME Analysis)
9797

9898
o2physics_add_dpl_workflow(qvector-table

‎EventFiltering/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ o2physics_add_dpl_workflow(fje-filter
8484

8585
o2physics_add_dpl_workflow(lf-strangeness-filter
8686
SOURCES PWGLF/strangenessFilter.cxx
87-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::ReconstructionDataFormats O2::DetectorsBase
87+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore KFParticle::KFParticle O2::ReconstructionDataFormats O2::DetectorsBase
8888
COMPONENT_NAME Analysis)
8989

9090
o2physics_add_dpl_workflow(mult-filter

‎EventFiltering/PWGEM/HeavyNeutralMesonFilter.cxx‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,13 @@ struct HeavyNeutralMesonFilter {
432432
mHistManager.add("GG/invMassVsPt_PCMEMC", "Invariant mass and pT of gg candidates;#bf{#it{M}_{#gamma#gamma}};#bf{#it{pT}_{#gamma#gamma}}", HistType::kTH2F, {{400, 0., 0.8}, {250, 0., 25.}});
433433
mHistManager.add("GG/invMassVsPt_EMC", "Invariant mass and pT of gg candidates;#bf{#it{M}_{#gamma#gamma}};#bf{#it{pT}_{#gamma#gamma}}", HistType::kTH2F, {{400, 0., 0.8}, {250, 0., 25.}});
434434

435-
mHistManager.add("HeavyNeutralMeson/invMassVsPt_PCM", "Invariant mass and pT of HNM candidates;#bf{#it{M}_{#pi^{+}#pi^{-}#gamma#gamma}};#bf{#it{pT}_{#pi^{+}#pi^{-}#gamma#gamma}}", HistType::kTH2F, {{600, 0.6, 1.2}, {250, 0., 25.}});
436-
mHistManager.add("HeavyNeutralMeson/invMassVsPt_PCMEMC", "Invariant mass and pT of HNM candidates;#bf{#it{M}_{#pi^{+}#pi^{-}#gamma#gamma}};#bf{#it{pT}_{#pi^{+}#pi^{-}#gamma#gamma}}", HistType::kTH2F, {{600, 0.6, 1.2}, {250, 0., 25.}});
437-
mHistManager.add("HeavyNeutralMeson/invMassVsPt_EMC", "Invariant mass and pT of HNM candidates;#bf{#it{M}_{#pi^{+}#pi^{-}#gamma#gamma}};#bf{#it{pT}_{#pi^{+}#pi^{-}#gamma#gamma}}", HistType::kTH2F, {{600, 0.6, 1.2}, {250, 0., 25.}});
435+
mHistManager.add("Omega/invMassVsPt_PCM", "Invariant mass and pT of omega meson candidates;#bf{#it{M}_{#pi^{+}#pi^{-}#gamma#gamma}};#bf{#it{pT}_{#pi^{+}#pi^{-}#gamma#gamma}}", HistType::kTH2F, {{400, 0.6, 1.}, {250, 0., 25.}});
436+
mHistManager.add("Omega/invMassVsPt_PCMEMC", "Invariant mass and pT of omega meson candidates;#bf{#it{M}_{#pi^{+}#pi^{-}#gamma#gamma}};#bf{#it{pT}_{#pi^{+}#pi^{-}#gamma#gamma}}", HistType::kTH2F, {{400, 0.6, 1.}, {250, 0., 25.}});
437+
mHistManager.add("Omega/invMassVsPt_EMC", "Invariant mass and pT of omega meson candidates;#bf{#it{M}_{#pi^{+}#pi^{-}#gamma#gamma}};#bf{#it{pT}_{#pi^{+}#pi^{-}#gamma#gamma}}", HistType::kTH2F, {{400, 0.6, 1.}, {250, 0., 25.}});
438+
439+
mHistManager.add("EtaPrime/invMassVsPt_PCM", "Invariant mass and pT of eta' candidates;#bf{#it{M}_{#pi^{+}#pi^{-}#gamma#gamma}};#bf{#it{pT}_{#pi^{+}#pi^{-}#gamma#gamma}}", HistType::kTH2F, {{400, 0.8, 1.2}, {250, 0., 25.}});
440+
mHistManager.add("EtaPrime/invMassVsPt_PCMEMC", "Invariant mass and pT of eta' candidates;#bf{#it{M}_{#pi^{+}#pi^{-}#gamma#gamma}};#bf{#it{pT}_{#pi^{+}#pi^{-}#gamma#gamma}}", HistType::kTH2F, {{400, 0.8, 1.2}, {250, 0., 25.}});
441+
mHistManager.add("EtaPrime/invMassVsPt_EMC", "Invariant mass and pT of eta' candidates;#bf{#it{M}_{#pi^{+}#pi^{-}#gamma#gamma}};#bf{#it{pT}_{#pi^{+}#pi^{-}#gamma#gamma}}", HistType::kTH2F, {{400, 0.8, 1.2}, {250, 0., 25.}});
438442

439443
// include all femto histograms
440444
mHistManager.add("fProcessedEvents", "CF - event filtered;;Events", HistType::kTH1F, {{15, -0.5, 14.5}});
@@ -768,7 +772,7 @@ struct HeavyNeutralMesonFilter {
768772
mHistManager.add("etaprimep/fAntiProtonPtVskstar_EMC", "Same Event distribution", HistType::kTH1F, {{8000, 0, 8}});
769773

770774
if (ConfDoEMCShift.value) {
771-
for (unsigned short iSM = 0; iSM < 20; iSM++) {
775+
for (int iSM = 0; iSM < 20; iSM++) {
772776
EMCEtaShift[iSM] = ConfEMCEtaShift.value[iSM];
773777
EMCPhiShift[iSM] = ConfEMCPhiShift.value[iSM];
774778
LOG(info) << "SM-wise shift in eta/phi for SM " << iSM << ": " << EMCEtaShift[iSM] << " / " << EMCPhiShift[iSM];
@@ -1498,21 +1502,30 @@ struct HeavyNeutralMesonFilter {
14981502

14991503
float massHNM = heavyNeutralMeson.m(cfgHNMMassCorrection);
15001504
if (heavyNeutralMeson.gg->reconstructionType == photonpair::kPCMPCM) {
1501-
mHistManager.fill(HIST("HeavyNeutralMeson/invMassVsPt_PCM"), massHNM, heavyNeutralMeson.pT());
1505+
if (heavyNeutralMeson.gg->isPi0)
1506+
mHistManager.fill(HIST("Omega/invMassVsPt_PCM"), massHNM, heavyNeutralMeson.pT());
1507+
else if (heavyNeutralMeson.gg->isEta)
1508+
mHistManager.fill(HIST("EtaPrime/invMassVsPt_PCM"), massHNM, heavyNeutralMeson.pT());
15021509
// QA
15031510
mHistManager.fill(HIST("TrackCuts/HMN/Before/PCM/fInvMass"), massHNM);
15041511
mHistManager.fill(HIST("TrackCuts/HMN/Before/PCM/fPt"), heavyNeutralMeson.pT());
15051512
mHistManager.fill(HIST("TrackCuts/HMN/Before/PCM/fEta"), heavyNeutralMeson.eta());
15061513
mHistManager.fill(HIST("TrackCuts/HMN/Before/PCM/fPhi"), translatePhi(heavyNeutralMeson.phi()));
15071514
} else if (heavyNeutralMeson.gg->reconstructionType == photonpair::kEMCEMC) {
1508-
mHistManager.fill(HIST("HeavyNeutralMeson/invMassVsPt_EMC"), massHNM, heavyNeutralMeson.pT());
1515+
if (heavyNeutralMeson.gg->isPi0)
1516+
mHistManager.fill(HIST("Omega/invMassVsPt_EMC"), massHNM, heavyNeutralMeson.pT());
1517+
else if (heavyNeutralMeson.gg->isEta)
1518+
mHistManager.fill(HIST("EtaPrime/invMassVsPt_EMC"), massHNM, heavyNeutralMeson.pT());
15091519
// QA
15101520
mHistManager.fill(HIST("TrackCuts/HMN/Before/EMC/fInvMass"), massHNM);
15111521
mHistManager.fill(HIST("TrackCuts/HMN/Before/EMC/fPt"), heavyNeutralMeson.pT());
15121522
mHistManager.fill(HIST("TrackCuts/HMN/Before/EMC/fEta"), heavyNeutralMeson.eta());
15131523
mHistManager.fill(HIST("TrackCuts/HMN/Before/EMC/fPhi"), translatePhi(heavyNeutralMeson.phi()));
15141524
} else {
1515-
mHistManager.fill(HIST("HeavyNeutralMeson/invMassVsPt_PCMEMC"), massHNM, heavyNeutralMeson.pT());
1525+
if (heavyNeutralMeson.gg->isPi0)
1526+
mHistManager.fill(HIST("Omega/invMassVsPt_PCMEMC"), massHNM, heavyNeutralMeson.pT());
1527+
else if (heavyNeutralMeson.gg->isEta)
1528+
mHistManager.fill(HIST("EtaPrime/invMassVsPt_PCMEMC"), massHNM, heavyNeutralMeson.pT());
15161529
// QA
15171530
mHistManager.fill(HIST("TrackCuts/HMN/Before/PCMEMC/fInvMass"), massHNM);
15181531
mHistManager.fill(HIST("TrackCuts/HMN/Before/PCMEMC/fPt"), heavyNeutralMeson.pT());

0 commit comments

Comments
 (0)