Skip to content

Commit 63db0d8

Browse files
AlexianLAlexianL
committed
fix clang
1 parent 4a76ac9 commit 63db0d8

1 file changed

Lines changed: 32 additions & 33 deletions

File tree

‎PWGHF/HFC/Tasks/taskFlow.cxx‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ enum FT0DetectorChannels {
116116

117117
enum FT0InnerOrOuter {
118118
FT0Error = 0,
119-
FT0InnerRing = 1,
119+
FT0InnerRing = 1,
120120
FT0OuterRing = 2,
121121
NFT0InnerOrOuterSteps
122122
};
@@ -397,7 +397,7 @@ struct HfTaskFlow {
397397
// =========================
398398

399399
using SmallGroupMcCollisions = soa::SmallGroups<soa::Join<aod::McCollisionLabels, aod::Collisions, aod::EvSel, aod::CentFT0Cs, aod::CentFT0CVariant1s, aod::CentFT0Ms, aod::CentFV0As, aod::Mults>>;
400-
// using FilteredMcCollisionsWMult = soa::Filtered<soa::Join<aod::McCollisions, aod::MultMCExtras>>;
400+
// using FilteredMcCollisionsWMult = soa::Filtered<soa::Join<aod::McCollisions, aod::MultMCExtras>>;
401401
using FilteredMcCollisionsWMult = soa::Join<aod::McCollisions, aod::MultMCExtras>;
402402
using FilteredMcCollisionsWMultWCollsExtra = soa::Filtered<soa::Join<aod::McCollisions, aod::McCollsExtra, aod::MultMCExtras>>;
403403
// using FilteredMcParticles = soa::Filtered<aod::McParticles>;
@@ -730,7 +730,7 @@ struct HfTaskFlow {
730730
// =========================
731731

732732
if (doprocessSameTpcMftChCh || doprocessSameTpcMftChChReassociated || doprocessSameTpcMftChChReassociated3d || doprocessSameTpcMftChChNonAmbiguous) {
733-
733+
734734
if (!configTask.removeQAForSystematics) {
735735
addHistograms<Data, TpcMft, ChPartChPart>();
736736
addMftHistograms();
@@ -763,7 +763,7 @@ struct HfTaskFlow {
763763
}
764764

765765
if (doprocessSameTpcMftLcCh || doprocessSameTpcMftLcChReassociated) {
766-
766+
767767
if (!configTask.removeQAForSystematics) {
768768
addHistograms<Data, TpcMft, LcChPart>();
769769
addMftHistograms();
@@ -854,7 +854,7 @@ struct HfTaskFlow {
854854
}
855855

856856
if (doprocessSameTpcFt0aD0Ch) {
857-
857+
858858
if (!configTask.removeQAForSystematics) {
859859
addHistograms<Data, TpcFt0a, D0ChPart>();
860860
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
@@ -882,7 +882,7 @@ struct HfTaskFlow {
882882
// =========================
883883

884884
if (doprocessSameMftFt0aChCh || doprocessSameMftFt0aChChReassociated || doprocessSameMftFt0aChChReassociated3d || doprocessSameMftFt0aChChNonAmbiguous) {
885-
885+
886886
if (!configTask.removeQAForSystematics) {
887887
addHistograms<Data, MftFt0a, ChPartChPart>();
888888
addMftHistograms();
@@ -916,7 +916,7 @@ struct HfTaskFlow {
916916
// =========================
917917

918918
if (doprocessSameTpcFt0cChCh) {
919-
919+
920920
if (!configTask.removeQAForSystematics) {
921921
addHistograms<Data, TpcFt0c, ChPartChPart>();
922922
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
@@ -945,7 +945,7 @@ struct HfTaskFlow {
945945
}
946946

947947
if (doprocessSameTpcFt0cD0Ch) {
948-
948+
949949
if (!configTask.removeQAForSystematics) {
950950
addHistograms<Data, TpcFt0c, D0ChPart>();
951951
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
@@ -957,7 +957,7 @@ struct HfTaskFlow {
957957
}
958958

959959
if (doprocessSameTpcFt0cLcCh) {
960-
960+
961961
if (!configTask.removeQAForSystematics) {
962962
addHistograms<Data, TpcFt0c, LcChPart>();
963963
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
@@ -973,7 +973,7 @@ struct HfTaskFlow {
973973
// =========================
974974

975975
if (doprocessSameFt0aFt0cChCh) {
976-
976+
977977
if (!configTask.removeQAForSystematics) {
978978
addHistograms<Data, Ft0aFt0c, ChPartChPart>();
979979
registry.add("Data/FT0Amp", "", {HistType::kTH2F, {configAxis.axisChID, configAxis.axisAmplitudeFit}});
@@ -1026,7 +1026,6 @@ struct HfTaskFlow {
10261026
} else if (configTask.chooseCorrelationCase.value == static_cast<int>(CorrelationCase::Ft0aFt0c)) {
10271027
addHistograms<Mc, Ft0aFt0c, ChPartChPart>();
10281028
}
1029-
10301029
}
10311030

10321031
if (!configTask.doEtaDependentFlow && !configTask.doVariationContainers) {
@@ -1316,7 +1315,8 @@ struct HfTaskFlow {
13161315
}
13171316
}
13181317

1319-
int isInnerOrOuter(int channelId, int fitType) {
1318+
int isInnerOrOuter(int channelId, int fitType)
1319+
{
13201320
if (fitType == isFT0C) {
13211321
if (channelId >= FT0DetectorChannels::FT0CInnerRingMin && channelId <= FT0DetectorChannels::FT0CInnerRingMax) {
13221322
if (!configTask.removeQAForSystematics) {
@@ -1473,9 +1473,9 @@ struct HfTaskFlow {
14731473
if (weight == 0) {
14741474
return false;
14751475
}
1476-
1476+
14771477
if (!configTask.removeQAForSystematics) {
1478-
registry.fill(HIST("Data/hCentralityWeighted"), centrality, weight);
1478+
registry.fill(HIST("Data/hCentralityWeighted"), centrality, weight);
14791479
}
14801480

14811481
weightCent = weight;
@@ -1487,7 +1487,7 @@ struct HfTaskFlow {
14871487
// =========================
14881488

14891489
template <typename TCollision, typename TTracks>
1490-
bool isAcceptedEventActivity(TCollision const& collision, TTracks const& tracks, int& multiplicity, float& centrality, float& centralityWeight)
1490+
bool isAcceptedEventActivity(TCollision const& collision, TTracks const& tracks, int& multiplicity, float& centrality, float& centralityWeight)
14911491
{
14921492
if (configCollision.useMultiplicityFromTracks) {
14931493
if (!configTask.removeQAForSystematics) {
@@ -1497,7 +1497,7 @@ struct HfTaskFlow {
14971497
} else {
14981498
multiplicity = getMultiplicityEstimator(collision, true);
14991499
}
1500-
1500+
15011501
centrality = getCentralityEstimator(collision, true);
15021502
if (configCollision.useCentrality) {
15031503
getCentralityWeight(centralityWeight, centrality);
@@ -2609,13 +2609,13 @@ struct HfTaskFlow {
26092609
target->getPairHist()->Fill(step, eta1 - eta2, 0.5, pt1, multiplicity, deltaPhi, posZ,
26102610
amplitude * centralityWeight * triggerWeight * associatedWeight);
26112611
} else if (configTask.doEtaDependentFlow) {
2612-
if (!configFit.discriminateInnerOrOuter) {
2613-
target->getPairHist()->Fill(step, sampleIndex, posZ, eta2, eta1, deltaPhi, eta1 - eta2,
2614-
amplitude * centralityWeight * triggerWeight * associatedWeight);
2615-
} else {
2616-
target->getPairHist()->Fill(step, sampleIndex, posZ, isInnerOrOuter(channelId, fitType), eta1, deltaPhi, eta1 - eta2,
2617-
amplitude * centralityWeight * triggerWeight * associatedWeight);
2618-
}
2612+
if (!configFit.discriminateInnerOrOuter) {
2613+
target->getPairHist()->Fill(step, sampleIndex, posZ, eta2, eta1, deltaPhi, eta1 - eta2,
2614+
amplitude * centralityWeight * triggerWeight * associatedWeight);
2615+
} else {
2616+
target->getPairHist()->Fill(step, sampleIndex, posZ, isInnerOrOuter(channelId, fitType), eta1, deltaPhi, eta1 - eta2,
2617+
amplitude * centralityWeight * triggerWeight * associatedWeight);
2618+
}
26192619
} else {
26202620
target->getPairHist()->Fill(step, sampleIndex, posZ, pt1, multiplicity, deltaPhi, eta1 - eta2,
26212621
amplitude * centralityWeight * triggerWeight * associatedWeight);
@@ -2680,7 +2680,7 @@ struct HfTaskFlow {
26802680
} else if (configTask.doEtaDependentFlow) {
26812681
// target->getPairHist()->Fill(step, sampleIndex, posZ, etaC, etaA, deltaPhi, etaA - etaC,
26822682
// amplitudeA * amplitudeC * centralityWeight * triggerWeight * associatedWeight);
2683-
2683+
26842684
if (!configFit.discriminateInnerOrOuter) {
26852685
target->getPairHist()->Fill(step, sampleIndex, posZ, etaC, etaA, deltaPhi, etaA - etaC,
26862686
amplitudeA * amplitudeC * centralityWeight * triggerWeight * associatedWeight);
@@ -2714,7 +2714,7 @@ struct HfTaskFlow {
27142714

27152715
if (configTask.useCutNeutralParticles) {
27162716
auto pdgTriggerParticle = pdg->GetParticle(track1.pdgCode());
2717-
if (!pdgTriggerParticle || std::abs(pdgTriggerParticle->Charge()) < o2::constants::math::Almost0) {
2717+
if (!pdgTriggerParticle || std::abs(pdgTriggerParticle->Charge()) < o2::constants::math::Almost0) {
27182718
continue;
27192719
}
27202720
}
@@ -2758,7 +2758,7 @@ struct HfTaskFlow {
27582758
fillTriggerQa<Mc, Ft0aFt0c, ChPartChPart>(multiplicity, track1.eta(), track1.phi(), track1.pt());
27592759
}
27602760
}
2761-
2761+
27622762
loopCounter++;
27632763

27642764
for (auto const& track2 : tracksAssoc) {
@@ -3242,7 +3242,7 @@ struct HfTaskFlow {
32423242
}
32433243

32443244
if (!configTask.removeQAForSystematics) {
3245-
registry.fill(HIST("Data/hNTracks"), tracks.size());
3245+
registry.fill(HIST("Data/hNTracks"), tracks.size());
32463246
}
32473247

32483248
auto bc = collision.template bc_as<aod::BCsWithTimestamps>();
@@ -3255,7 +3255,6 @@ struct HfTaskFlow {
32553255
return;
32563256
}
32573257

3258-
32593258
sameEventHf->fillEvent(multiplicity, CorrelationContainer::kCFStepReconstructed);
32603259
fillCorrelations(sameEventHf, CorrelationContainer::CFStep::kCFStepReconstructed, candidates, tracks, multiplicity, collision.posZ(), true, getMagneticField(bc.timestamp()), centralityWeight);
32613260
}
@@ -3352,7 +3351,7 @@ struct HfTaskFlow {
33523351
registry.fill(HIST("Data/Mft/hNMftTracks"), mftTracks.size());
33533352
registry.fill(HIST("Data/Mft/hNBestCollisionFwd"), reassociatedMftTracks.size());
33543353
}
3355-
3354+
33563355
auto bc = collision.template bc_as<aod::BCsWithTimestamps>();
33573356
loadEfficiencyCorrection(bc.timestamp());
33583357
auto multiplicity = 0;
@@ -3382,7 +3381,7 @@ struct HfTaskFlow {
33823381
if (!(isAcceptedCollision(collision, true))) {
33833382
return;
33843383
}
3385-
3384+
33863385
if (!configTask.removeQAForSystematics) {
33873386
registry.fill(HIST("Data/hNTracks"), tracks.size());
33883387
registry.fill(HIST("Data/Mft/hNMftTracks"), mftTracks.size());
@@ -3395,7 +3394,7 @@ struct HfTaskFlow {
33953394
float centrality = 0.f;
33963395
float centralityWeight = 1.f;
33973396
auto uncorrectedMultiplicity = multiplicity;
3398-
3397+
33993398
if (!configTask.removeQAForSystematics) {
34003399
registry.fill(HIST("Data/hMultiplicity_uncorrected_vs_corrected"), uncorrectedMultiplicity, multiplicity);
34013400
}
@@ -3918,6 +3917,7 @@ struct HfTaskFlow {
39183917
loadEfficiencyCorrection(bc.timestamp());
39193918

39203919
if (collision.has_foundFT0()) {
3920+
39213921
loadGain(bc);
39223922
const auto& ft0 = collision.foundFT0();
39233923
auto multiplicity = 0;
@@ -4156,7 +4156,7 @@ struct HfTaskFlow {
41564156
FilteredMcParticles const& mcParticles,
41574157
SmallGroupMcCollisions const& collisions)
41584158
{
4159-
4159+
41604160
if (mcParticles.size() == 0) { // guard against empty filtered batch
41614161
return;
41624162
}
@@ -4576,7 +4576,6 @@ struct HfTaskFlow {
45764576
for (auto it = pairs.begin(); it != pairs.end(); it++) {
45774577
auto& [collision1, tracks1, collision2, tracks2] = *it;
45784578

4579-
45804579
if (tracks1.size() == 0 || tracks2.size() == 0) { // guard against empty filtered batch
45814580
return;
45824581
}

0 commit comments

Comments
 (0)