Skip to content

Commit f5333a1

Browse files
prchakraprchakra
authored
[PWGCF] FemtoUniverse: Fixing same event fillings for pp system @prchakra (#9566)
1 parent c2a01a2 commit f5333a1

File tree

2 files changed

+90
-50
lines changed

2 files changed

+90
-50
lines changed

‎PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrack3DMultKtExtended.cxx‎

Lines changed: 50 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -574,8 +574,8 @@ struct femtoUniversePairTaskTrackTrack3DMultKtExtended {
574574
/// process function for to call doSameEvent with Data
575575
/// \param col subscribe to the collision table (Data)
576576
/// \param parts subscribe to the femtoUniverseParticleTable
577-
void processSameEvent(FilteredFDCollision& col,
578-
FilteredFemtoFullParticles& parts)
577+
void processSameEvent(FilteredFDCollision const& col,
578+
FilteredFemtoFullParticles const& parts)
579579
{
580580
fillCollision(col, ConfIsCent);
581581

@@ -585,16 +585,26 @@ struct femtoUniversePairTaskTrackTrack3DMultKtExtended {
585585
bool fillQA = true;
586586
randgen = new TRandom2(0);
587587

588-
if (cfgProcessPM) {
589-
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
590-
}
591-
592-
if (cfgProcessPP) {
593-
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
594-
}
595-
596-
if (cfgProcessMM) {
597-
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
588+
if (ConfIsCent) {
589+
if (cfgProcessPM) {
590+
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
591+
}
592+
if (cfgProcessPP) {
593+
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
594+
}
595+
if (cfgProcessMM) {
596+
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
597+
}
598+
} else {
599+
if (cfgProcessPM) {
600+
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 1, fillQA);
601+
}
602+
if (cfgProcessPP) {
603+
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multNtr(), 2, fillQA);
604+
}
605+
if (cfgProcessMM) {
606+
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 3, fillQA);
607+
}
598608
}
599609
delete randgen;
600610
}
@@ -604,9 +614,9 @@ struct femtoUniversePairTaskTrackTrack3DMultKtExtended {
604614
/// \param col subscribe to the collision table (Monte Carlo Reconstructed reconstructed)
605615
/// \param parts subscribe to joined table FemtoUniverseParticles and FemtoUniverseMCLables to access Monte Carlo truth
606616
/// \param FemtoUniverseMCParticles subscribe to the Monte Carlo truth table
607-
void processSameEventMC(o2::aod::FdCollision& col,
608-
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels>& parts,
609-
o2::aod::FdMCParticles&)
617+
void processSameEventMC(o2::aod::FdCollision const& col,
618+
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels> const& parts,
619+
o2::aod::FdMCParticles const&)
610620
{
611621
fillCollision(col, ConfIsCent);
612622

@@ -616,16 +626,26 @@ struct femtoUniversePairTaskTrackTrack3DMultKtExtended {
616626
bool fillQA = true;
617627
randgen = new TRandom2(0);
618628

619-
if (cfgProcessPM) {
620-
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
621-
}
622-
623-
if (cfgProcessPP) {
624-
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
625-
}
626-
627-
if (cfgProcessMM) {
628-
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
629+
if (ConfIsCent) {
630+
if (cfgProcessPM) {
631+
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
632+
}
633+
if (cfgProcessPP) {
634+
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
635+
}
636+
if (cfgProcessMM) {
637+
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
638+
}
639+
} else {
640+
if (cfgProcessPM) {
641+
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 1, fillQA);
642+
}
643+
if (cfgProcessPP) {
644+
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multNtr(), 2, fillQA);
645+
}
646+
if (cfgProcessMM) {
647+
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 3, fillQA);
648+
}
629649
}
630650
delete randgen;
631651
}
@@ -736,8 +756,8 @@ struct femtoUniversePairTaskTrackTrack3DMultKtExtended {
736756
/// process function for to call doMixedEvent with Data
737757
/// @param cols subscribe to the collisions table (Data)
738758
/// @param parts subscribe to the femtoUniverseParticleTable
739-
void processMixedEventCent(FilteredFDCollisions& cols,
740-
FilteredFemtoFullParticles& parts)
759+
void processMixedEventCent(FilteredFDCollisions const& cols,
760+
FilteredFemtoFullParticles const& parts)
741761
{
742762
randgen = new TRandom2(0);
743763

@@ -777,9 +797,9 @@ struct femtoUniversePairTaskTrackTrack3DMultKtExtended {
777797
/// @param cols subscribe to the collisions table (Monte Carlo Reconstructed reconstructed)
778798
/// @param parts subscribe to joined table FemtoUniverseParticles and FemtoUniverseMCLables to access Monte Carlo truth
779799
/// @param FemtoUniverseMCParticles subscribe to the Monte Carlo truth table
780-
void processMixedEventMCCent(o2::aod::FdCollisions& cols,
781-
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels>& parts,
782-
o2::aod::FdMCParticles&)
800+
void processMixedEventMCCent(o2::aod::FdCollisions const& cols,
801+
soa::Join<FilteredFemtoFullParticles, aod::FDMCLabels> const& parts,
802+
o2::aod::FdMCParticles const&)
783803
{
784804
randgen = new TRandom2(0);
785805

‎PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx‎

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -558,16 +558,26 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
558558
bool fillQA = true;
559559
randgen = new TRandom2(0);
560560

561-
if (cfgProcessPM) {
562-
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
563-
}
564-
565-
if (cfgProcessPP) {
566-
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
567-
}
568-
569-
if (cfgProcessMM) {
570-
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
561+
if (ConfIsCent) {
562+
if (cfgProcessPM) {
563+
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
564+
}
565+
if (cfgProcessPP) {
566+
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
567+
}
568+
if (cfgProcessMM) {
569+
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
570+
}
571+
} else {
572+
if (cfgProcessPM) {
573+
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 1, fillQA);
574+
}
575+
if (cfgProcessPP) {
576+
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multNtr(), 2, fillQA);
577+
}
578+
if (cfgProcessMM) {
579+
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 3, fillQA);
580+
}
571581
}
572582
delete randgen;
573583
}
@@ -588,16 +598,26 @@ struct femtoUniversePairTaskTrackTrackSpherHarMultKtExtended {
588598
bool fillQA = true;
589599
randgen = new TRandom2(0);
590600

591-
if (cfgProcessPM) {
592-
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
593-
}
594-
595-
if (cfgProcessPP) {
596-
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
597-
}
598-
599-
if (cfgProcessMM) {
600-
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
601+
if (ConfIsCent) {
602+
if (cfgProcessPM) {
603+
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 1, fillQA);
604+
}
605+
if (cfgProcessPP) {
606+
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multV0M(), 2, fillQA);
607+
}
608+
if (cfgProcessMM) {
609+
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multV0M(), 3, fillQA);
610+
}
611+
} else {
612+
if (cfgProcessPM) {
613+
doSameEvent<false>(thegroupPartsOne, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 1, fillQA);
614+
}
615+
if (cfgProcessPP) {
616+
doSameEvent<false>(thegroupPartsOne, thegroupPartsOne, parts, col.magField(), col.multNtr(), 2, fillQA);
617+
}
618+
if (cfgProcessMM) {
619+
doSameEvent<false>(thegroupPartsTwo, thegroupPartsTwo, parts, col.magField(), col.multNtr(), 3, fillQA);
620+
}
601621
}
602622
delete randgen;
603623
}

0 commit comments

Comments
 (0)