Skip to content

Commit 0e1757f

Browse files
authored
remove unnecessary configurable flag
1 parent a5ea351 commit 0e1757f

File tree

1 file changed

+66
-71
lines changed

1 file changed

+66
-71
lines changed

PWGLF/TableProducer/Nuspex/ebyeMaker.cxx

Lines changed: 66 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@ struct EbyeMaker {
257257

258258
Configurable<LabeledArray<float>> cfgTrackSels{"cfgTrackSels", {kTrackSels, 1, 12, particleName, trackSelsNames}, "Track selections"};
259259
Configurable<LabeledArray<float>> cfgDcaSelsParam{"cfgDcaSelsParam", {kDcaSelsParam[0], 3, 3, dcaSelsNames, dcaParNames}, "DCA threshold settings"};
260-
Configurable<bool> fillMini{"fillMini", false, "fill mini tables"};
261260

262261
std::array<float, kNpart> ptMin;
263262
std::array<float, kNpart> ptTof;
@@ -987,38 +986,36 @@ struct EbyeMaker {
987986
histos.fill(HIST("QA/V0MvsCL0"), centralityCl0, centrality);
988987
histos.fill(HIST("QA/trackletsVsV0M"), centrality, multTracklets);
989988

990-
if (fillMini) {
991-
miniCollTable(static_cast<int8_t>(collision.posZ() * 10), 0x0, nTrackletsColl, centrality, nTracksColl);
992-
for (auto& candidateTrack : candidateTracks[0]) { // o2-linter: disable=const-ref-in-for-loop (not a const ref)
993-
auto tk = tracks.rawIteratorAt(candidateTrack.globalIndex);
994-
fillTableMiniTrack<false>(candidateTrack, tk);
995-
}
996-
} else {
997-
collisionEbyeTable(centrality, collision.posZ());
998-
for (const auto& candidateV0 : candidateV0s) {
999-
lambdaEbyeTable(
989+
miniCollTable(static_cast<int8_t>(collision.posZ() * 10), 0x0, nTrackletsColl, centrality, nTracksColl);
990+
for (auto& candidateTrack : candidateTracks[0]) { // o2-linter: disable=const-ref-in-for-loop (not a const ref)
991+
auto tk = tracks.rawIteratorAt(candidateTrack.globalIndex);
992+
fillTableMiniTrack<false>(candidateTrack, tk);
993+
}
994+
995+
collisionEbyeTable(centrality, collision.posZ());
996+
for (const auto& candidateV0 : candidateV0s) {
997+
lambdaEbyeTable(
998+
collisionEbyeTable.lastIndex(),
999+
candidateV0.pt,
1000+
candidateV0.eta,
1001+
candidateV0.mass,
1002+
candidateV0.dcav0pv,
1003+
candidateV0.dcav0daugh,
1004+
candidateV0.cpa,
1005+
candidateV0.globalIndexNeg,
1006+
candidateV0.globalIndexPos);
1007+
}
1008+
for (int iP{0}; iP < kNpart; ++iP) {
1009+
for (const auto& candidateTrack : candidateTracks[iP]) { // deuterons + protons
1010+
nucleiEbyeTable(
10001011
collisionEbyeTable.lastIndex(),
1001-
candidateV0.pt,
1002-
candidateV0.eta,
1003-
candidateV0.mass,
1004-
candidateV0.dcav0pv,
1005-
candidateV0.dcav0daugh,
1006-
candidateV0.cpa,
1007-
candidateV0.globalIndexNeg,
1008-
candidateV0.globalIndexPos);
1009-
}
1010-
for (int iP{0}; iP < kNpart; ++iP) {
1011-
for (const auto& candidateTrack : candidateTracks[iP]) { // deuterons + protons
1012-
nucleiEbyeTable(
1013-
collisionEbyeTable.lastIndex(),
1014-
candidateTrack.pt,
1015-
candidateTrack.eta,
1016-
candidateTrack.mass,
1017-
candidateTrack.dcapv,
1018-
candidateTrack.tpcncls,
1019-
candidateTrack.tpcnsigma,
1020-
candidateTrack.tofmass);
1021-
}
1012+
candidateTrack.pt,
1013+
candidateTrack.eta,
1014+
candidateTrack.mass,
1015+
candidateTrack.dcapv,
1016+
candidateTrack.tpcncls,
1017+
candidateTrack.tpcnsigma,
1018+
candidateTrack.tofmass);
10221019
}
10231020
}
10241021
}
@@ -1129,46 +1126,44 @@ struct EbyeMaker {
11291126
fillMcEvent(collision, tracks, v0TableThisCollision, centrality, mcParticles, mcLab);
11301127
fillMcGen(mcParticles, mcLab, collision.mcCollisionId());
11311128

1132-
if (fillMini) {
1133-
miniCollTable(static_cast<int8_t>(collision.posZ() * 10), nChPartGen, nTrackletsColl, centrality, nTracksColl);
1134-
for (auto& candidateTrack : candidateTracks[0]) { // o2-linter: disable=const-ref-in-for-loop (not a const ref)
1135-
auto tk = candidateTrack.isreco ? tracks.rawIteratorAt(candidateTrack.globalIndex) : tracks.rawIteratorAt(0);
1136-
fillTableMiniTrack<true>(candidateTrack, tk);
1137-
}
1138-
} else {
1139-
collisionEbyeTable(centrality, collision.posZ());
1140-
for (const auto& candidateV0 : candidateV0s) {
1141-
mcLambdaEbyeTable(
1129+
miniCollTable(static_cast<int8_t>(collision.posZ() * 10), nChPartGen, nTrackletsColl, centrality, nTracksColl);
1130+
for (auto& candidateTrack : candidateTracks[0]) { // o2-linter: disable=const-ref-in-for-loop (not a const ref)
1131+
auto tk = candidateTrack.isreco ? tracks.rawIteratorAt(candidateTrack.globalIndex) : tracks.rawIteratorAt(0);
1132+
fillTableMiniTrack<true>(candidateTrack, tk);
1133+
}
1134+
1135+
collisionEbyeTable(centrality, collision.posZ());
1136+
for (const auto& candidateV0 : candidateV0s) {
1137+
mcLambdaEbyeTable(
1138+
collisionEbyeTable.lastIndex(),
1139+
candidateV0.pt,
1140+
candidateV0.eta,
1141+
candidateV0.mass,
1142+
candidateV0.dcav0pv,
1143+
candidateV0.dcav0daugh,
1144+
candidateV0.cpa,
1145+
candidateV0.globalIndexNeg,
1146+
candidateV0.globalIndexPos,
1147+
candidateV0.genpt,
1148+
candidateV0.geneta,
1149+
candidateV0.pdgcode,
1150+
candidateV0.isreco);
1151+
}
1152+
for (int iP{0}; iP < kNpart; ++iP) {
1153+
for (const auto& candidateTrack : candidateTracks[iP]) { // deuterons + protons
1154+
mcNucleiEbyeTable(
11421155
collisionEbyeTable.lastIndex(),
1143-
candidateV0.pt,
1144-
candidateV0.eta,
1145-
candidateV0.mass,
1146-
candidateV0.dcav0pv,
1147-
candidateV0.dcav0daugh,
1148-
candidateV0.cpa,
1149-
candidateV0.globalIndexNeg,
1150-
candidateV0.globalIndexPos,
1151-
candidateV0.genpt,
1152-
candidateV0.geneta,
1153-
candidateV0.pdgcode,
1154-
candidateV0.isreco);
1155-
}
1156-
for (int iP{0}; iP < kNpart; ++iP) {
1157-
for (const auto& candidateTrack : candidateTracks[iP]) { // deuterons + protons
1158-
mcNucleiEbyeTable(
1159-
collisionEbyeTable.lastIndex(),
1160-
candidateTrack.pt,
1161-
candidateTrack.eta,
1162-
candidateTrack.mass,
1163-
candidateTrack.dcapv,
1164-
candidateTrack.tpcncls,
1165-
candidateTrack.tpcnsigma,
1166-
candidateTrack.tofmass,
1167-
candidateTrack.genpt,
1168-
candidateTrack.geneta,
1169-
candidateTrack.pdgcode,
1170-
candidateTrack.isreco);
1171-
}
1156+
candidateTrack.pt,
1157+
candidateTrack.eta,
1158+
candidateTrack.mass,
1159+
candidateTrack.dcapv,
1160+
candidateTrack.tpcncls,
1161+
candidateTrack.tpcnsigma,
1162+
candidateTrack.tofmass,
1163+
candidateTrack.genpt,
1164+
candidateTrack.geneta,
1165+
candidateTrack.pdgcode,
1166+
candidateTrack.isreco);
11721167
}
11731168
}
11741169
}

0 commit comments

Comments
 (0)