@@ -52,20 +52,20 @@ using namespace o2::framework::expressions;
5252
5353struct HfTaskOmegac0ToOmegaPiQa {
5454
55- Configurable<bool > selectionFlagOmegac0{" selectionFlagOmegac0" , true , " Select Omegac0 candidates" };
55+ Configurable<int > selectionFlagOmegac0{" selectionFlagOmegac0" , 7 , " Selection Flag for Omegac0 candidates. 1 -> skimmed, 3 -> topological, 7 -> PID, 15 -> ML " };
5656 Configurable<double > yCandGenMax{" yCandGenMax" , 0.5 , " Max. gen particle rapidity" };
5757 Configurable<double > yCandRecoMax{" yCandRecoMax" , 0.8 , " Max. cand. rapidity" };
5858
5959 SliceCache cache;
6060
61- using Omegac0Cands = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelToOmegaPi >>;
62- using Omegac0CandsKF = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelToOmegaPi , aod::HfCandCascBachKfQa>>;
63- using Omegac0CandsMc = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelToOmegaPi , aod::HfCandCascBachMCRecQa>>;
64- using Omegac0CandsMcKF = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelToOmegaPi , aod::HfCandCascBachKfQa, aod::HfCandCascBachMCRecQa>>;
65- using Omegac0CandsMl = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelToOmegaPi , aod::HfMlSelOmegacToOmegaPi >>;
66- using Omegac0CandsMlKF = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelToOmegaPi , aod::HfMlSelOmegacToOmegaPi , aod::HfCandCascBachKfQa>>;
67- using Omegac0CandsMlMc = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelToOmegaPi , aod::HfMlSelOmegacToOmegaPi , aod::HfCandCascBachMCRecQa>>;
68- using Omegac0CandsMlMcKF = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelToOmegaPi , aod::HfMlSelOmegacToOmegaPi , aod::HfCandCascBachKfQa, aod::HfCandCascBachMCRecQa>>;
61+ using Omegac0Cands = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelOmegaC0ToOmegaPi >>;
62+ using Omegac0CandsKF = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelOmegaC0ToOmegaPi , aod::HfCandCascBachKfQa>>;
63+ using Omegac0CandsMc = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelOmegaC0ToOmegaPi , aod::HfCandCascBachMCRecQa>>;
64+ using Omegac0CandsMcKF = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelOmegaC0ToOmegaPi , aod::HfCandCascBachKfQa, aod::HfCandCascBachMCRecQa>>;
65+ using Omegac0CandsMl = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelOmegaC0ToOmegaPi , aod::HfMlOmegaC0ToOmegaPi >>;
66+ using Omegac0CandsMlKF = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelOmegaC0ToOmegaPi , aod::HfMlOmegaC0ToOmegaPi , aod::HfCandCascBachKfQa>>;
67+ using Omegac0CandsMlMc = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelOmegaC0ToOmegaPi , aod::HfMlOmegaC0ToOmegaPi , aod::HfCandCascBachMCRecQa>>;
68+ using Omegac0CandsMlMcKF = soa::Filtered<soa::Join<aod::HfCandCascBachQa, aod::HfSelOmegaC0ToOmegaPi , aod::HfMlOmegaC0ToOmegaPi , aod::HfCandCascBachKfQa, aod::HfCandCascBachMCRecQa>>;
6969
7070 using Omegac0Gen = soa::Filtered<soa::Join<aod::McParticles, aod::HfCandCascBachMCGenQa>>;
7171
@@ -161,10 +161,10 @@ struct HfTaskOmegac0ToOmegaPiQa {
161161 }
162162
163163 template <bool ApplyMl, typename CandType>
164- void processData (const CandType& candidates)
164+ void runDataAnalysis (const CandType& candidates)
165165 {
166166 for (const auto & candidate : candidates) {
167- if (!( candidate.resultSelections () == true || (candidate. resultSelections () == false && ! selectionFlagOmegac0)) ) {
167+ if (candidate.isSelOmegaC0ToOmegaPi () < selectionFlagOmegac0) {
168168 continue ;
169169 }
170170
@@ -174,17 +174,17 @@ struct HfTaskOmegac0ToOmegaPiQa {
174174 }
175175
176176 if constexpr (ApplyMl) {
177- registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac, candidate.mlProbOmegac ()[0 ]);
177+ registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac, candidate.mlProbOmegaC0ToOmegaPi ()[0 ]);
178178 } else {
179179 registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac);
180180 }
181181 }
182182 }
183183
184184 template <bool UseCentrality, bool ApplyMl, typename CandType, typename CollType>
185- void processDataCent (const CandType& candidate, CollType const & collision)
185+ void runDataAnalysisCentPerCandidate (const CandType& candidate, CollType const & collision)
186186 {
187- if (!( candidate.resultSelections () == true || (candidate. resultSelections () == false && ! selectionFlagOmegac0)) ) {
187+ if (candidate.isSelOmegaC0ToOmegaPi () < selectionFlagOmegac0) {
188188 return ;
189189 }
190190
@@ -197,25 +197,25 @@ struct HfTaskOmegac0ToOmegaPiQa {
197197 if constexpr (UseCentrality) {
198198 float const cent = o2::hf_centrality::getCentralityColl (collision);
199199 if constexpr (ApplyMl) {
200- registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac, cent, numPvContributors, candidate.mlProbOmegac ()[0 ]);
200+ registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac, cent, numPvContributors, candidate.mlProbOmegaC0ToOmegaPi ()[0 ]);
201201 } else {
202202 registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac, cent, numPvContributors);
203203 }
204204 } else {
205205 if constexpr (ApplyMl) {
206- registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac, candidate.mlProbOmegac ()[0 ]);
206+ registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac, candidate.mlProbOmegaC0ToOmegaPi ()[0 ]);
207207 } else {
208208 registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac);
209209 }
210210 }
211211 }
212212
213213 template <bool ApplyMl, typename CandType>
214- void processMc (const CandType& candidates, Omegac0Gen const & mcParticles)
214+ void runMcAnalysis (const CandType& candidates, Omegac0Gen const & mcParticles)
215215 {
216216 // MC rec.
217217 for (const auto & candidate : candidates) {
218- if (!( candidate.resultSelections () == true || (candidate. resultSelections () == false && ! selectionFlagOmegac0)) ) {
218+ if (candidate.isSelOmegaC0ToOmegaPi () < selectionFlagOmegac0) {
219219 continue ;
220220 }
221221
@@ -225,7 +225,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
225225 }
226226
227227 if constexpr (ApplyMl) {
228- registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac, candidate.ptBhadMotherPart (), candidate.originMcRec (), candidate.flagMcMatchRec (), candidate.mlProbOmegac ()[0 ]);
228+ registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac, candidate.ptBhadMotherPart (), candidate.originMcRec (), candidate.flagMcMatchRec (), candidate.mlProbOmegaC0ToOmegaPi ()[0 ]);
229229 } else {
230230 registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac, candidate.ptBhadMotherPart (), candidate.originMcRec (), candidate.flagMcMatchRec ());
231231 }
@@ -250,12 +250,12 @@ struct HfTaskOmegac0ToOmegaPiQa {
250250 }
251251
252252 template <bool ApplyMl, typename CandType, typename McCollisionWithCents>
253- void processMcCent (const CandType& candidates, Omegac0Gen const & mcParticles,
254- CollisionsWithMcLabels const & collisions, McCollisionWithCents const &)
253+ void runMcAnalysisCentPerCandidate (const CandType& candidates, Omegac0Gen const & mcParticles,
254+ CollisionsWithMcLabels const & collisions, McCollisionWithCents const &)
255255 {
256256 // MC rec.
257257 for (const auto & candidate : candidates) {
258- if (!( candidate.resultSelections () == true || (candidate. resultSelections () == false && ! selectionFlagOmegac0)) ) {
258+ if (candidate.isSelOmegaC0ToOmegaPi () < selectionFlagOmegac0) {
259259 continue ;
260260 }
261261
@@ -269,7 +269,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
269269 float const mcCent = o2::hf_centrality::getCentralityColl (collision.template mcCollision_as <McCollisionWithCents>());
270270
271271 if constexpr (ApplyMl) {
272- registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac, mcCent, numPvContributors, candidate.ptBhadMotherPart (), candidate.originMcRec (), candidate.flagMcMatchRec (), candidate.mlProbOmegac ()[0 ]);
272+ registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac, mcCent, numPvContributors, candidate.ptBhadMotherPart (), candidate.originMcRec (), candidate.flagMcMatchRec (), candidate.mlProbOmegaC0ToOmegaPi ()[0 ]);
273273 } else {
274274 registry.fill (HIST (" hReco" ), HfHelperQa::invMassOmegaczeroToOmegaPi (candidate), candidate.pt (), yOmegac, mcCent, numPvContributors, candidate.ptBhadMotherPart (), candidate.originMcRec (), candidate.flagMcMatchRec ());
275275 }
@@ -321,13 +321,13 @@ struct HfTaskOmegac0ToOmegaPiQa {
321321
322322 void processDataDCAFitter (Omegac0Cands const & candidates)
323323 {
324- processData <false >(candidates);
324+ runDataAnalysis <false >(candidates);
325325 }
326326 PROCESS_SWITCH (HfTaskOmegac0ToOmegaPiQa, processDataDCAFitter, " process data with DCAFitter" , false );
327327
328328 void processDataDCAFitterMl (Omegac0CandsMl const & candidates)
329329 {
330- processData <true >(candidates);
330+ runDataAnalysis <true >(candidates);
331331 }
332332 PROCESS_SWITCH (HfTaskOmegac0ToOmegaPiQa, processDataDCAFitterMl, " process data with DCAFitter, ML selections" , false );
333333
@@ -338,7 +338,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
338338 auto groupedOmegacCandidates = candidates.sliceBy (candOmegacPerCollision, collision.globalIndex ());
339339
340340 for (const auto & candidate : groupedOmegacCandidates) {
341- processDataCent <true , false >(candidate, collision);
341+ runDataAnalysisCentPerCandidate <true , false >(candidate, collision);
342342 }
343343 }
344344 }
@@ -351,7 +351,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
351351 auto groupedOmegacCandidates = candidates.sliceBy (candOmegacMlPerCollision, collision.globalIndex ());
352352
353353 for (const auto & candidate : groupedOmegacCandidates) {
354- processDataCent <true , true >(candidate, collision);
354+ runDataAnalysisCentPerCandidate <true , true >(candidate, collision);
355355 }
356356 }
357357 }
@@ -364,7 +364,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
364364 auto groupedOmegacCandidates = candidates.sliceBy (candOmegacPerCollision, collision.globalIndex ());
365365
366366 for (const auto & candidate : groupedOmegacCandidates) {
367- processDataCent <true , false >(candidate, collision);
367+ runDataAnalysisCentPerCandidate <true , false >(candidate, collision);
368368 }
369369 }
370370 }
@@ -377,7 +377,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
377377 auto groupedOmegacCandidates = candidates.sliceBy (candOmegacMlPerCollision, collision.globalIndex ());
378378
379379 for (const auto & candidate : groupedOmegacCandidates) {
380- processDataCent <true , true >(candidate, collision);
380+ runDataAnalysisCentPerCandidate <true , true >(candidate, collision);
381381 }
382382 }
383383 }
@@ -389,13 +389,13 @@ struct HfTaskOmegac0ToOmegaPiQa {
389389
390390 void processDataKFParticle (Omegac0CandsKF const & candidates)
391391 {
392- processData <false >(candidates);
392+ runDataAnalysis <false >(candidates);
393393 }
394394 PROCESS_SWITCH (HfTaskOmegac0ToOmegaPiQa, processDataKFParticle, " process data with KFParticle" , false );
395395
396396 void processDataKFParticleMl (Omegac0CandsMlKF const & candidates)
397397 {
398- processData <true >(candidates);
398+ runDataAnalysis <true >(candidates);
399399 }
400400 PROCESS_SWITCH (HfTaskOmegac0ToOmegaPiQa, processDataKFParticleMl, " process data with KFParticle, ML selections" , false );
401401
@@ -406,7 +406,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
406406 auto groupedOmegacCandidates = candidates.sliceBy (candOmegacKFPerCollision, collision.globalIndex ());
407407
408408 for (const auto & candidate : groupedOmegacCandidates) {
409- processDataCent <true , false >(candidate, collision);
409+ runDataAnalysisCentPerCandidate <true , false >(candidate, collision);
410410 }
411411 }
412412 }
@@ -419,7 +419,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
419419 auto groupedOmegacCandidates = candidates.sliceBy (candOmegacKFMlPerCollision, collision.globalIndex ());
420420
421421 for (const auto & candidate : groupedOmegacCandidates) {
422- processDataCent <true , true >(candidate, collision);
422+ runDataAnalysisCentPerCandidate <true , true >(candidate, collision);
423423 }
424424 }
425425 }
@@ -432,7 +432,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
432432 auto groupedOmegacCandidates = candidates.sliceBy (candOmegacKFPerCollision, collision.globalIndex ());
433433
434434 for (const auto & candidate : groupedOmegacCandidates) {
435- processDataCent <true , false >(candidate, collision);
435+ runDataAnalysisCentPerCandidate <true , false >(candidate, collision);
436436 }
437437 }
438438 }
@@ -445,7 +445,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
445445 auto groupedOmegacCandidates = candidates.sliceBy (candOmegacKFMlPerCollision, collision.globalIndex ());
446446
447447 for (const auto & candidate : groupedOmegacCandidates) {
448- processDataCent <true , true >(candidate, collision);
448+ runDataAnalysisCentPerCandidate <true , true >(candidate, collision);
449449 }
450450 }
451451 }
@@ -458,14 +458,14 @@ struct HfTaskOmegac0ToOmegaPiQa {
458458 void processMcDCAFitter (Omegac0CandsMc const & omegaC0CandidatesMc,
459459 Omegac0Gen const & mcParticles)
460460 {
461- processMc <false >(omegaC0CandidatesMc, mcParticles);
461+ runMcAnalysis <false >(omegaC0CandidatesMc, mcParticles);
462462 }
463463 PROCESS_SWITCH (HfTaskOmegac0ToOmegaPiQa, processMcDCAFitter, " Process MC with DCAFitter" , false );
464464
465465 void processMcDCAFitterMl (Omegac0CandsMlMc const & omegac0CandidatesMlMc,
466466 Omegac0Gen const & mcParticles)
467467 {
468- processMc <true >(omegac0CandidatesMlMc, mcParticles);
468+ runMcAnalysis <true >(omegac0CandidatesMlMc, mcParticles);
469469 }
470470 PROCESS_SWITCH (HfTaskOmegac0ToOmegaPiQa, processMcDCAFitterMl, " Process MC with DCAFitter, ML selections" , false );
471471
@@ -474,7 +474,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
474474 CollisionsWithMcLabels const & collisions,
475475 McCollisionsWithFT0M const & mcCollisions)
476476 {
477- processMcCent <false >(omegaC0CandidatesMc, mcParticles, collisions, mcCollisions);
477+ runMcAnalysisCentPerCandidate <false >(omegaC0CandidatesMc, mcParticles, collisions, mcCollisions);
478478 }
479479 PROCESS_SWITCH (HfTaskOmegac0ToOmegaPiQa, processMcDCAFitterFT0M, " Process MC with DCAFitter, FT0M centrality (from MC)" , false );
480480
@@ -483,7 +483,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
483483 CollisionsWithMcLabels const & collisions,
484484 McCollisionsWithFT0M const & mcCollisions)
485485 {
486- processMcCent <true >(omegac0CandidatesMlMc, mcParticles, collisions, mcCollisions);
486+ runMcAnalysisCentPerCandidate <true >(omegac0CandidatesMlMc, mcParticles, collisions, mcCollisions);
487487 }
488488 PROCESS_SWITCH (HfTaskOmegac0ToOmegaPiQa, processMcDCAFitterMlFT0M, " Process MC with DCAFitter, ML selections, FT0M centrality (from MC)" , false );
489489
@@ -494,14 +494,14 @@ struct HfTaskOmegac0ToOmegaPiQa {
494494 void processMcKFParticle (Omegac0CandsMcKF const & omegaC0CandidatesMcKF,
495495 Omegac0Gen const & mcParticles)
496496 {
497- processMc <false >(omegaC0CandidatesMcKF, mcParticles);
497+ runMcAnalysis <false >(omegaC0CandidatesMcKF, mcParticles);
498498 }
499499 PROCESS_SWITCH (HfTaskOmegac0ToOmegaPiQa, processMcKFParticle, " Process MC with KFParticle" , false );
500500
501501 void processMcKFParticleMl (Omegac0CandsMlMcKF const & omegac0CandidatesMlMcKF,
502502 Omegac0Gen const & mcParticles)
503503 {
504- processMc <true >(omegac0CandidatesMlMcKF, mcParticles);
504+ runMcAnalysis <true >(omegac0CandidatesMlMcKF, mcParticles);
505505 }
506506 PROCESS_SWITCH (HfTaskOmegac0ToOmegaPiQa, processMcKFParticleMl, " Process MC with KFParticle, ML selections" , false );
507507
@@ -510,7 +510,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
510510 CollisionsWithMcLabels const & collisions,
511511 McCollisionsWithFT0M const & mcCollisions)
512512 {
513- processMcCent <false >(omegaC0CandidatesMcKF, mcParticles, collisions, mcCollisions);
513+ runMcAnalysisCentPerCandidate <false >(omegaC0CandidatesMcKF, mcParticles, collisions, mcCollisions);
514514 }
515515 PROCESS_SWITCH (HfTaskOmegac0ToOmegaPiQa, processMcKFParticleFT0M, " Process MC with KFParticle, FT0M centrality (from MC)" , false );
516516
@@ -519,7 +519,7 @@ struct HfTaskOmegac0ToOmegaPiQa {
519519 CollisionsWithMcLabels const & collisions,
520520 McCollisionsWithFT0M const & mcCollisions)
521521 {
522- processMcCent <true >(omegac0CandidatesMlMcKF, mcParticles, collisions, mcCollisions);
522+ runMcAnalysisCentPerCandidate <true >(omegac0CandidatesMlMcKF, mcParticles, collisions, mcCollisions);
523523 }
524524 PROCESS_SWITCH (HfTaskOmegac0ToOmegaPiQa, processMcKFParticleMlFT0M, " Process MC with KFParticle, ML selections, FT0M centrality (from MC)" , false );
525525};
0 commit comments