Skip to content

Commit edd7cf7

Browse files
authored
Merge pull request #6 from alibuild/alibot-cleanup-7802
Please consider the following formatting changes to #7802
2 parents 876dafd + 0e43de8 commit edd7cf7

File tree

1 file changed

+25
-28
lines changed

1 file changed

+25
-28
lines changed

PWGHF/HFC/Tasks/taskFlow.cxx

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ struct HfTaskFlow {
101101

102102
// Even add McCollisions in the join ?
103103
// Kata adds subscribes to it but do not add it in the join
104-
//using FilteredCollisionsWSelMultMC = soa::Filtered<soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::Mults, aod::McCollisions>>;
104+
// using FilteredCollisionsWSelMultMC = soa::Filtered<soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::Mults, aod::McCollisions>>;
105105
using FilteredCollisionsWSelMultMC = soa::Filtered<soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::Mults>>;
106106
using TracksWDcaSelMC = soa::Filtered<soa::Join<aod::TracksWDca, aod::TrackSelection, aod::McTrackLabels>>;
107107

@@ -116,7 +116,7 @@ struct HfTaskFlow {
116116
using aodMcCollisions = soa::Filtered<aod::McCollisions>;
117117

118118
using aodMcParticles = soa::Filtered<aod::McParticles>;
119-
119+
120120
using aodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TracksDCA, aod::TrackSelection, aod::McTrackLabels>>;
121121

122122
// From Katarina's code, but not sure if I use it
@@ -947,15 +947,15 @@ struct HfTaskFlow {
947947
if constexpr (std::is_same_v<FilteredCollisionsWSelMultMC, TCollisions>) { // If MC
948948
registry.fill(HIST("MC/Rec/TpcTpc/HadronHadron/MixedEvent/hEventCountMixing"), bin);
949949
fillTpcTpcChChMixedEventQAmc(multiplicityTracks2, vz, tracks1);
950-
951-
//if constexpr (std::is_same_v<HfCandidatesSel, TTracksTrig>) {
952-
// registry.fill(HIST("Data/TpcTpc/HfHadron/MixedEvent/hEventCountHFMixing"), bin);
953-
// fillHFMixingQA(multiplicity, vz, tracks1);
954-
//} else {
955-
// registry.fill(HIST("Data/TpcTpc/HadronHadron/MixedEvent/hEventCountMixing"), bin);
956-
// fillMixingQA(multiplicity, vz, tracks1);
957-
//}
958-
950+
951+
// if constexpr (std::is_same_v<HfCandidatesSel, TTracksTrig>) {
952+
// registry.fill(HIST("Data/TpcTpc/HfHadron/MixedEvent/hEventCountHFMixing"), bin);
953+
// fillHFMixingQA(multiplicity, vz, tracks1);
954+
// } else {
955+
// registry.fill(HIST("Data/TpcTpc/HadronHadron/MixedEvent/hEventCountMixing"), bin);
956+
// fillMixingQA(multiplicity, vz, tracks1);
957+
// }
958+
959959
} else { // If not MC
960960
if constexpr (std::is_same_v<HfCandidatesSel, TTracksTrig>) { // DATA : If TPC-TPC Hf-h case
961961
registry.fill(HIST("Data/TpcTpc/HfHadron/MixedEvent/hEventCountHFMixing"), bin);
@@ -1013,15 +1013,14 @@ struct HfTaskFlow {
10131013
// TODO : FILL NEW PLOTS FOR MCTRUTH ONLY
10141014
registry.fill(HIST("MC/Gen/TpcTpc/HadronHadron/MixedEvent/hEventCountMixing"), bin);
10151015
fillTpcTpcChChMixedEventQAmc(multiplicity, vz, tracks1);
1016-
1017-
//if constexpr (std::is_same_v<HfCandidatesSel, TTracksTrig>) {
1018-
// registry.fill(HIST("Data/TpcTpc/HfHadron/MixedEvent/hEventCountHFMixing"), bin);
1019-
// fillHFMixingQA(multiplicity, vz, tracks1);
1020-
//} else {
1021-
// registry.fill(HIST("Data/TpcTpc/HadronHadron/MixedEvent/hEventCountMixing"), bin);
1022-
// fillMixingQA(multiplicity, vz, tracks1);
1023-
//}
1024-
1016+
1017+
// if constexpr (std::is_same_v<HfCandidatesSel, TTracksTrig>) {
1018+
// registry.fill(HIST("Data/TpcTpc/HfHadron/MixedEvent/hEventCountHFMixing"), bin);
1019+
// fillHFMixingQA(multiplicity, vz, tracks1);
1020+
// } else {
1021+
// registry.fill(HIST("Data/TpcTpc/HadronHadron/MixedEvent/hEventCountMixing"), bin);
1022+
// fillMixingQA(multiplicity, vz, tracks1);
1023+
// }
10251024

10261025
corrContainer->fillEvent(multiplicity, CorrelationContainer::kCFStepAll);
10271026
// TO-DO : probably put the step of the correlation container in the template of this function
@@ -1137,7 +1136,7 @@ struct HfTaskFlow {
11371136
// if (!(isCollisionSelected(mcCollision, true))) {
11381137
// return;
11391138
//}
1140-
//if (!(isCollisionSelected(mcCollision, true))) {
1139+
// if (!(isCollisionSelected(mcCollision, true))) {
11411140
// return;
11421141
//}
11431142

@@ -1233,13 +1232,11 @@ struct HfTaskFlow {
12331232
return size;
12341233
};
12351234

1236-
1237-
//auto getTracksSize = [&candidates, this](FilteredCollisionsWSelMult::iterator const& col) {
1238-
// auto associatedTracks = candidates.sliceByCached(o2::aod::track::collisionId, col.globalIndex(), this->cache);
1239-
// auto size = associatedTracks.size();
1240-
// return size;
1241-
//};
1242-
1235+
// auto getTracksSize = [&candidates, this](FilteredCollisionsWSelMult::iterator const& col) {
1236+
// auto associatedTracks = candidates.sliceByCached(o2::aod::track::collisionId, col.globalIndex(), this->cache);
1237+
// auto size = associatedTracks.size();
1238+
// return size;
1239+
// };
12431240

12441241
mixCollisions(collisions, candidates, tracks, getTracksSize, mixedTPCTPCHfCh);
12451242
}

0 commit comments

Comments
 (0)