Skip to content

Commit 2617ff2

Browse files
vkuceravkucera
authored
[PWGHF,PWGJE,Trigger] Divide candidate data model into skimming, reconstruction, aliases (#13503)
1 parent c9dfedd commit 2617ff2

File tree

110 files changed

+682
-425
lines changed

Some content is hidden

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

110 files changed

+682
-425
lines changed

‎EventFiltering/PWGHF/HFFilter.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "EventFiltering/filterTables.h"
2424
//
2525
#include "PWGHF/Core/SelectorCuts.h"
26-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
26+
#include "PWGHF/DataModel/TrackIndexSkimmingTables.h"
2727
//
2828
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
2929
#include "PWGLF/DataModel/LFStrangenessTables.h"
@@ -179,7 +179,7 @@ struct HfFilter { // Main struct for HF triggers
179179
Service<o2::ccdb::BasicCCDBManager> ccdb;
180180

181181
using BigTracksMCPID = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr, aod::pidTPCFullDe, aod::pidTOFFullDe, aod::McTrackLabels>;
182-
using BigTracksPID = soa::Join<aod::Tracks, aod::TracksWCovDcaExtra, aod::TracksDCA, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr, aod::pidTPCFullDe, aod::pidTOFFullDe>;
182+
using BigTracksPID = soa::Join<aod::Tracks, aod::TracksCov, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa, aod::pidTPCFullPr, aod::pidTOFFullPr, aod::pidTPCFullDe, aod::pidTOFFullDe>;
183183
using TracksIUPID = soa::Join<aod::TracksIU, aod::TracksExtra, aod::TracksCovIU, aod::pidTPCFullPr, aod::pidTOFFullPr, aod::pidTPCFullPi, aod::pidTOFFullPi>;
184184
using CollsWithEvSel = soa::Join<aod::Collisions, aod::EvSels>;
185185

‎EventFiltering/PWGHF/HFFilterCharmHadronSignals.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "EventFiltering/PWGHF/HFFilterHelpers.h"
1818
//
1919
#include "PWGHF/Core/SelectorCuts.h"
20-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
20+
#include "PWGHF/DataModel/TrackIndexSkimmingTables.h"
2121
//
2222
#include "Common/CCDB/EventSelectionParams.h"
2323
#include "Common/Core/RecoDecay.h"

‎EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "EventFiltering/PWGHF/HFFilterHelpers.h"
2222
//
23-
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
23+
#include "PWGHF/DataModel/TrackIndexSkimmingTables.h"
2424
//
2525
#include "Common/Core/RecoDecay.h"
2626
#include "Common/Core/trackUtilities.h"

‎PWGHF/ALICE3/Core/DecayChannelsLegacy.h‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
12+
/// \file DecayChannelsLegacy.h
13+
/// \brief Legacy definitions of constants for MC flagging of HF decay channels.
14+
/// \author Vít Kučera <vit.kucera@cern.ch>, Inha University
15+
16+
#ifndef PWGHF_ALICE3_CORE_DECAYCHANNELSLEGACY_H_
17+
#define PWGHF_ALICE3_CORE_DECAYCHANNELSLEGACY_H_
18+
19+
namespace o2::aod
20+
{
21+
namespace hf_cand_x
22+
{
23+
enum DecayType {
24+
XToJpsiToEEPiPi = 0,
25+
XToJpsiToMuMuPiPi
26+
};
27+
} // namespace hf_cand_x
28+
29+
namespace hf_cand_xicc
30+
{
31+
enum DecayType {
32+
XiccToXicPi = 0
33+
};
34+
} // namespace hf_cand_xicc
35+
36+
namespace hf_cand_chic
37+
{
38+
enum DecayType {
39+
ChicToJpsiToEEGamma = 0,
40+
ChicToJpsiToMuMuGamma
41+
};
42+
} // namespace hf_cand_chic
43+
44+
} // namespace o2::aod
45+
46+
#endif // PWGHF_ALICE3_CORE_DECAYCHANNELSLEGACY_H_

‎PWGHF/Core/DecayChannelsLegacy.h‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
12+
/// \file DecayChannelsLegacy.h
13+
/// \brief Legacy definitions of constants for MC flagging of HF decay channels.
14+
/// \author Vít Kučera <vit.kucera@cern.ch>, Inha University
15+
/// \note Should be replaced with corresponding constants in DecayChannels.h.
16+
17+
#ifndef PWGHF_CORE_DECAYCHANNELSLEGACY_H_
18+
#define PWGHF_CORE_DECAYCHANNELSLEGACY_H_
19+
20+
namespace o2::aod
21+
{
22+
namespace hf_cand_xic0_omegac0
23+
{
24+
enum DecayType {
25+
XiczeroToXiPi = 0,
26+
OmegaczeroToXiPi,
27+
OmegaczeroToOmegaPi,
28+
OmegaczeroToOmegaK,
29+
OmegaczeroToOmegaPiOneMu
30+
};
31+
} // namespace hf_cand_xic0_omegac0
32+
33+
namespace hf_cand_xic_to_xi_pi_pi
34+
{
35+
enum DecayType {
36+
XicToXiPiPi = 0, // Ξc± → Ξ∓ π± π±
37+
XicToXiResPiToXiPiPi, // Ξc± → Ξ(1530) π± → Ξ∓ π± π±
38+
NDecayType
39+
};
40+
} // namespace hf_cand_xic_to_xi_pi_pi
41+
42+
namespace hf_cand_dstar
43+
{
44+
enum DecayType {
45+
DstarToD0Pi = 0,
46+
D0ToPiK,
47+
DstarToD0PiPi0,
48+
D0ToPiKPi0,
49+
NDstarDecayType
50+
};
51+
} // namespace hf_cand_dstar
52+
53+
namespace hf_cand_sigmac
54+
{
55+
enum DecayType {
56+
Sc0ToPKPiPi = 0,
57+
ScplusplusToPKPiPi,
58+
ScStar0ToPKPiPi,
59+
ScStarPlusPlusToPKPiPi
60+
};
61+
} // namespace hf_cand_sigmac
62+
63+
namespace hf_cand_b0
64+
{
65+
enum DecayType {
66+
B0ToDPi = 0,
67+
B0ToDstarPi
68+
};
69+
} // namespace hf_cand_b0
70+
71+
namespace hf_cand_bplus
72+
{
73+
enum DecayType {
74+
BplusToD0Pi = 0
75+
};
76+
} // namespace hf_cand_bplus
77+
78+
namespace hf_cand_bs
79+
{
80+
enum DecayType {
81+
BsToDsPi = 0
82+
};
83+
} // namespace hf_cand_bs
84+
85+
namespace hf_cand_lb
86+
{
87+
enum DecayType {
88+
LbToLcPi
89+
};
90+
} // namespace hf_cand_lb
91+
92+
} // namespace o2::aod
93+
94+
#endif // PWGHF_CORE_DECAYCHANNELSLEGACY_H_

‎PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@
1919
/// \author Biao Zhang <biao.zhang@cern.ch>, Heidelberg University
2020

2121
#include "PWGHF/Core/CentralityEstimation.h"
22+
#include "PWGHF/Core/DecayChannelsLegacy.h"
2223
#include "PWGHF/Core/HfHelper.h"
2324
#include "PWGHF/Core/SelectorCuts.h"
2425
#include "PWGHF/D2H/DataModel/ReducedDataModel.h"
2526
#include "PWGHF/D2H/Utils/utilsRedDataFormat.h"
27+
#include "PWGHF/DataModel/AliasTables.h"
2628
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
2729
#include "PWGHF/DataModel/CandidateSelectionTables.h"
30+
#include "PWGHF/DataModel/TrackIndexSkimmingTables.h"
2831
#include "PWGHF/Utils/utilsEvSelHf.h"
2932
#include "PWGHF/Utils/utilsTrkCandHf.h"
3033

‎PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
#include "PWGHF/Core/SelectorCuts.h"
2222
#include "PWGHF/D2H/DataModel/ReducedDataModel.h"
2323
#include "PWGHF/D2H/Utils/utilsRedDataFormat.h"
24+
#include "PWGHF/DataModel/AliasTables.h"
2425
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
2526
#include "PWGHF/DataModel/CandidateSelectionTables.h"
27+
#include "PWGHF/DataModel/TrackIndexSkimmingTables.h"
2628
#include "PWGHF/Utils/utilsEvSelHf.h"
2729
#include "PWGHF/Utils/utilsTrkCandHf.h"
2830

‎PWGHF/D2H/Tasks/taskB0.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "PWGHF/Core/DecayChannels.h"
1818
#include "PWGHF/Core/HfHelper.h"
1919
#include "PWGHF/Core/SelectorCuts.h"
20+
#include "PWGHF/DataModel/AliasTables.h"
2021
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
2122
#include "PWGHF/DataModel/CandidateSelectionTables.h"
2223

‎PWGHF/D2H/Tasks/taskBplus.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "PWGHF/Core/DecayChannels.h"
2222
#include "PWGHF/Core/HfHelper.h"
2323
#include "PWGHF/Core/SelectorCuts.h"
24+
#include "PWGHF/DataModel/AliasTables.h"
2425
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
2526
#include "PWGHF/DataModel/CandidateSelectionTables.h"
2627

‎PWGHF/D2H/Tasks/taskBs.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "PWGHF/Core/DecayChannels.h"
1919
#include "PWGHF/Core/HfHelper.h"
2020
#include "PWGHF/Core/SelectorCuts.h"
21+
#include "PWGHF/DataModel/AliasTables.h"
2122
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
2223
#include "PWGHF/DataModel/CandidateSelectionTables.h"
2324

0 commit comments

Comments
 (0)