Skip to content

Commit 26a60d1

Browse files
jesgumjesgum
committed
otf tracker deprecate McPartsWithDau
1 parent 66611ba commit 26a60d1

3 files changed

Lines changed: 59 additions & 58 deletions

File tree

‎ALICE3/TableProducer/OTF/onTheFlyDecayer.cxx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@ struct OnTheFlyDecayer {
172172
{
173173
for (const auto& collision : mcCollisions) {
174174
allParticles.clear();
175+
176+
// Reproduce collision table to have AOD origin
175177
mCollisionId = collision.globalIndex();
176178
tableMcCollisions(collision.bcId(),
177179
collision.generatorsID(),
@@ -214,10 +216,11 @@ struct OnTheFlyDecayer {
214216

215217
struct OnTheFlyDecayerExtensionSpawner {
216218
Spawns<aod::McParticles_001Extension> spawnMcParticlesExtensions;
217-
void init(InitContext const&) {}
219+
void init(o2::framework::InitContext&) {}
218220
};
219221

220222
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
221223
{
222-
return WorkflowSpec{adaptAnalysisTask<OnTheFlyDecayer>(cfgc), adaptAnalysisTask<OnTheFlyDecayerExtensionSpawner>(cfgc)};
224+
return WorkflowSpec{adaptAnalysisTask<OnTheFlyDecayer>(cfgc),
225+
adaptAnalysisTask<OnTheFlyDecayerExtensionSpawner>(cfgc)};
223226
}

‎ALICE3/TableProducer/OTF/onTheFlyTracker.cxx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "ALICE3/Core/OTFParticle.h"
3131
#include "ALICE3/Core/TrackUtilities.h"
3232
#include "ALICE3/DataModel/OTFCollision.h"
33-
#include "ALICE3/DataModel/OTFMCParticle.h"
3433
#include "ALICE3/DataModel/OTFStrangeness.h"
3534
#include "ALICE3/DataModel/collisionAlice3.h"
3635
#include "ALICE3/DataModel/tracksAlice3.h"
@@ -137,7 +136,6 @@ struct OnTheFlyTracker {
137136
Produces<aod::StoredTracksCov> tableStoredTracksCov;
138137
Produces<aod::TracksCovExtension> tableTracksCovExtension;
139138
Produces<aod::McTrackLabels> tableMcTrackLabels;
140-
Produces<aod::McTrackWithDauLabels> tableMcTrackWithDauLabels;
141139
Produces<aod::TracksDCA> tableTracksDCA;
142140
Produces<aod::TracksDCACov> tableTracksDCACov;
143141
Produces<aod::CollisionsAlice3> tableCollisionsAlice3;
@@ -1731,7 +1729,6 @@ struct OnTheFlyTracker {
17311729
trackParCov.getSigmaTgl2(), trackParCov.getSigma1PtY(), trackParCov.getSigma1PtZ(), trackParCov.getSigma1PtSnp(), trackParCov.getSigma1PtTgl(),
17321730
trackParCov.getSigma1Pt2());
17331731
tableMcTrackLabels(trackParCov.mcLabel, 0);
1734-
tableMcTrackWithDauLabels(trackParCov.mcLabel, 0);
17351732
tableTracksExtraA3(trackParCov.nSiliconHits, trackParCov.nTPCHits, trackParCov.trackType);
17361733

17371734
// populate extra tables if required to do so
@@ -1933,7 +1930,7 @@ struct OnTheFlyTracker {
19331930
}
19341931
}
19351932

1936-
void processConfigurationDev(aod::McCollision const& mcCollision, aod::McPartWithDaus const& mcParticles, const int icfg)
1933+
void processConfigurationDev(aod::McCollision const& mcCollision, aod::McParticles const& mcParticles, const int icfg)
19371934
{
19381935
const std::string histPath = "Configuration_" + std::to_string(icfg) + "/";
19391936
tracksAlice3.clear();
@@ -2000,7 +1997,7 @@ struct OnTheFlyTracker {
20001997

20011998
bool reconstructed = false;
20021999
int nTrkHits = 0;
2003-
if (enablePrimarySmearing && mcParticle.isPrimary()) {
2000+
if (enablePrimarySmearing && mcParticle.isPhysicalPrimary()) {
20042001
o2::upgrade::convertMCParticleToO2Track(mcParticle, trackParCov, pdgDB);
20052002
reconstructed = mSmearer[icfg]->smearTrack(trackParCov, mcParticle.pdgCode(), dNdEta);
20062003
nTrkHits = fastTrackerSettings.minSiliconHits;
@@ -2074,7 +2071,7 @@ struct OnTheFlyTracker {
20742071
fillTracksInfo(ghostTracksAlice3, primaryVertex, icfg);
20752072
}
20762073

2077-
void processDecayer(aod::McCollision const& mcCollision, aod::McPartWithDaus const& mcParticles)
2074+
void processDecayer(aod::McCollision const& mcCollision, aod::McParticles const& mcParticles)
20782075
{
20792076
for (size_t icfg = 0; icfg < mSmearer.size(); ++icfg) {
20802077
processConfigurationDev(mcCollision, mcParticles, static_cast<int>(icfg));

‎ALICE3/Tasks/alice3DecayerQa.cxx‎

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -80,31 +80,31 @@ struct Alice3DecayerQa {
8080
void init(o2::framework::InitContext&)
8181
{
8282
// QA with Table entries
83-
histos.add("MCWithDau/hElPt", "hElPt", kTH1D, {axes.axisPt});
84-
histos.add("MCWithDau/hMuPt", "hMuPt", kTH1D, {axes.axisPt});
85-
histos.add("MCWithDau/hPiPt", "hPiPt", kTH1D, {axes.axisPt});
86-
histos.add("MCWithDau/hKaPt", "hKaPt", kTH1D, {axes.axisPt});
87-
histos.add("MCWithDau/hPrPt", "hPrPt", kTH1D, {axes.axisPt});
88-
histos.add("MCWithDau/hCollisionId", "hCollisionId", kTH1D, {axes.axisCollisionId});
89-
histos.add("MCWithDau/hPdgCode", "hPdgCode", kTH1D, {axes.axisPdgCode});
90-
histos.add("MCWithDau/hStatusCode", "hStatusCode", kTH1D, {axes.axisStatusCode});
91-
histos.add("MCWithDau/hFlags", "hFlags", kTH1D, {axes.axisFlags});
92-
histos.add("MCWithDau/hMothersIds", "hMothersIds", kTH1D, {axes.axisMothersIds});
93-
histos.add("MCWithDau/hDaughtersIds", "hDaughtersIds", kTH1D, {axes.axisDaughtersIds});
94-
histos.add("MCWithDau/hWeight", "hWeight", kTH1D, {axes.axisWeight});
95-
histos.add("MCWithDau/hVx", "hVx", kTH1D, {axes.axisPos});
96-
histos.add("MCWithDau/hVy", "hVy", kTH1D, {axes.axisPos});
97-
histos.add("MCWithDau/hVz", "hVz", kTH1D, {axes.axisPos});
98-
histos.add("MCWithDau/hVt", "hVt", kTH1D, {axes.axisPos});
99-
histos.add("MCWithDau/hPhi", "hPhi", kTH1D, {axes.axisPhi});
100-
histos.add("MCWithDau/hEta", "hEta", kTH1D, {axes.axisEta});
101-
histos.add("MCWithDau/hRapidity", "hRapidity", kTH1D, {axes.axisRapidity});
102-
histos.add("MCWithDau/hPx", "hPx", kTH1D, {axes.axisPt});
103-
histos.add("MCWithDau/hPy", "hPy", kTH1D, {axes.axisPt});
104-
histos.add("MCWithDau/hPz", "hPz", kTH1D, {axes.axisPt});
105-
histos.add("MCWithDau/hPt", "hPt", kTH1D, {axes.axisPt});
106-
histos.add("MCWithDau/hP", "hP", kTH1D, {axes.axisPt});
107-
histos.add("MCWithDau/hE", "hE", kTH1D, {axes.axisPt});
83+
histos.add("McParticle/hElPt", "hElPt", kTH1D, {axes.axisPt});
84+
histos.add("McParticle/hMuPt", "hMuPt", kTH1D, {axes.axisPt});
85+
histos.add("McParticle/hPiPt", "hPiPt", kTH1D, {axes.axisPt});
86+
histos.add("McParticle/hKaPt", "hKaPt", kTH1D, {axes.axisPt});
87+
histos.add("McParticle/hPrPt", "hPrPt", kTH1D, {axes.axisPt});
88+
histos.add("McParticle/hCollisionId", "hCollisionId", kTH1D, {axes.axisCollisionId});
89+
histos.add("McParticle/hPdgCode", "hPdgCode", kTH1D, {axes.axisPdgCode});
90+
histos.add("McParticle/hStatusCode", "hStatusCode", kTH1D, {axes.axisStatusCode});
91+
histos.add("McParticle/hFlags", "hFlags", kTH1D, {axes.axisFlags});
92+
histos.add("McParticle/hMothersIds", "hMothersIds", kTH1D, {axes.axisMothersIds});
93+
histos.add("McParticle/hDaughtersIds", "hDaughtersIds", kTH1D, {axes.axisDaughtersIds});
94+
histos.add("McParticle/hWeight", "hWeight", kTH1D, {axes.axisWeight});
95+
histos.add("McParticle/hVx", "hVx", kTH1D, {axes.axisPos});
96+
histos.add("McParticle/hVy", "hVy", kTH1D, {axes.axisPos});
97+
histos.add("McParticle/hVz", "hVz", kTH1D, {axes.axisPos});
98+
histos.add("McParticle/hVt", "hVt", kTH1D, {axes.axisPos});
99+
histos.add("McParticle/hPhi", "hPhi", kTH1D, {axes.axisPhi});
100+
histos.add("McParticle/hEta", "hEta", kTH1D, {axes.axisEta});
101+
histos.add("McParticle/hRapidity", "hRapidity", kTH1D, {axes.axisRapidity});
102+
histos.add("McParticle/hPx", "hPx", kTH1D, {axes.axisPt});
103+
histos.add("McParticle/hPy", "hPy", kTH1D, {axes.axisPt});
104+
histos.add("McParticle/hPz", "hPz", kTH1D, {axes.axisPt});
105+
histos.add("McParticle/hPt", "hPt", kTH1D, {axes.axisPt});
106+
histos.add("McParticle/hP", "hP", kTH1D, {axes.axisPt});
107+
histos.add("McParticle/hE", "hE", kTH1D, {axes.axisPt});
108108

109109
// QA with daughters from Decayer
110110
histos.add("K0S/hGeneratedPt", "hGeneratedPt;#it{p}_{T} (GeV/#it{c})", kTH1D, {axes.axisPt});
@@ -132,6 +132,7 @@ struct Alice3DecayerQa {
132132

133133
void process(const aod::McCollision& collision, const aod::McParticles& particles)
134134
{
135+
LOG(info) << particles.size();
135136
// Group with collision
136137
auto trueElectronsGrouped = trueElectrons->sliceByCached(aod::mcparticle::mcCollisionId, collision.globalIndex(), cache);
137138
auto trueMuonsGrouped = trueMuons->sliceByCached(aod::mcparticle::mcCollisionId, collision.globalIndex(), cache);
@@ -143,19 +144,19 @@ struct Alice3DecayerQa {
143144
auto trueXiMinusGrouped = trueXiMinus->sliceByCached(aod::mcparticle::mcCollisionId, collision.globalIndex(), cache);
144145

145146
for (const auto& particle : trueElectronsGrouped) {
146-
histos.fill(HIST("MCWithDau/hElPt"), particle.pt());
147+
histos.fill(HIST("McParticle/hElPt"), particle.pt());
147148
}
148149
for (const auto& particle : trueMuonsGrouped) {
149-
histos.fill(HIST("MCWithDau/hMuPt"), particle.pt());
150+
histos.fill(HIST("McParticle/hMuPt"), particle.pt());
150151
}
151152
for (const auto& particle : truePionsGrouped) {
152-
histos.fill(HIST("MCWithDau/hPiPt"), particle.pt());
153+
histos.fill(HIST("McParticle/hPiPt"), particle.pt());
153154
}
154155
for (const auto& particle : trueKaonsGrouped) {
155-
histos.fill(HIST("MCWithDau/hKaPt"), particle.pt());
156+
histos.fill(HIST("McParticle/hKaPt"), particle.pt());
156157
}
157158
for (const auto& particle : trueProtonsGrouped) {
158-
histos.fill(HIST("MCWithDau/hPrPt"), particle.pt());
159+
histos.fill(HIST("McParticle/hPrPt"), particle.pt());
159160
}
160161
for (const auto& particle : trueK0ShortGrouped) {
161162
histos.fill(HIST("K0S/hGeneratedPt"), particle.pt());
@@ -248,29 +249,29 @@ struct Alice3DecayerQa {
248249
}
249250

250251
for (const auto& particle : particles) {
251-
histos.fill(HIST("MCWithDau/hCollisionId"), particle.mcCollisionId());
252-
histos.fill(HIST("MCWithDau/hPdgCode"), particle.pdgCode());
253-
histos.fill(HIST("MCWithDau/hStatusCode"), particle.statusCode());
254-
histos.fill(HIST("MCWithDau/hFlags"), particle.flags());
255-
histos.fill(HIST("MCWithDau/hWeight"), particle.weight());
256-
histos.fill(HIST("MCWithDau/hVx"), particle.vx());
257-
histos.fill(HIST("MCWithDau/hVy"), particle.vy());
258-
histos.fill(HIST("MCWithDau/hVz"), particle.vz());
259-
histos.fill(HIST("MCWithDau/hVt"), particle.vt());
260-
histos.fill(HIST("MCWithDau/hPhi"), particle.phi());
261-
histos.fill(HIST("MCWithDau/hEta"), particle.eta());
262-
histos.fill(HIST("MCWithDau/hRapidity"), particle.y());
263-
histos.fill(HIST("MCWithDau/hPx"), particle.px());
264-
histos.fill(HIST("MCWithDau/hPy"), particle.py());
265-
histos.fill(HIST("MCWithDau/hPz"), particle.pz());
266-
histos.fill(HIST("MCWithDau/hPt"), particle.pt());
267-
histos.fill(HIST("MCWithDau/hP"), particle.p());
268-
histos.fill(HIST("MCWithDau/hE"), particle.e());
252+
histos.fill(HIST("McParticle/hCollisionId"), particle.mcCollisionId());
253+
histos.fill(HIST("McParticle/hPdgCode"), particle.pdgCode());
254+
histos.fill(HIST("McParticle/hStatusCode"), particle.statusCode());
255+
histos.fill(HIST("McParticle/hFlags"), particle.flags());
256+
histos.fill(HIST("McParticle/hWeight"), particle.weight());
257+
histos.fill(HIST("McParticle/hVx"), particle.vx());
258+
histos.fill(HIST("McParticle/hVy"), particle.vy());
259+
histos.fill(HIST("McParticle/hVz"), particle.vz());
260+
histos.fill(HIST("McParticle/hVt"), particle.vt());
261+
histos.fill(HIST("McParticle/hPhi"), particle.phi());
262+
histos.fill(HIST("McParticle/hEta"), particle.eta());
263+
histos.fill(HIST("McParticle/hRapidity"), particle.y());
264+
histos.fill(HIST("McParticle/hPx"), particle.px());
265+
histos.fill(HIST("McParticle/hPy"), particle.py());
266+
histos.fill(HIST("McParticle/hPz"), particle.pz());
267+
histos.fill(HIST("McParticle/hPt"), particle.pt());
268+
histos.fill(HIST("McParticle/hP"), particle.p());
269+
histos.fill(HIST("McParticle/hE"), particle.e());
269270
for (const auto& motherParticleId : particle.mothersIds()) {
270-
histos.fill(HIST("MCWithDau/hMothersIds"), motherParticleId);
271+
histos.fill(HIST("McParticle/hMothersIds"), motherParticleId);
271272
}
272273
for (const auto& dauParticleId : particle.daughtersIds()) {
273-
histos.fill(HIST("MCWithDau/hDaughtersIds"), dauParticleId);
274+
histos.fill(HIST("McParticle/hDaughtersIds"), dauParticleId);
274275
}
275276
}
276277
}

0 commit comments

Comments
 (0)