Skip to content

Commit 89a58ae

Browse files
kcui1kcui1
authored
[PWGLF] Code Optimization of hStrangeness correlation (#9287)
1 parent f399ec8 commit 89a58ae

File tree

1 file changed

+31
-30
lines changed

1 file changed

+31
-30
lines changed

‎PWGLF/Tasks/Strangeness/hStrangeCorrelation.cxx‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ struct correlateStrangeness {
452452
constexpr int index = i.value;
453453
float efficiency = 1.0f;
454454
if (applyEfficiencyCorrection) {
455-
efficiency = hEfficiencyCascade[index]->GetBinContent(hEfficiencyCascade[index]->GetXaxis()->FindBin(ptassoc), hEfficiencyCascade[index]->GetYaxis()->FindBin(assoc.eta()));
455+
efficiency = hEfficiencyCascade[index]->Interpolate(ptassoc, assoc.eta());
456456
}
457457
if (applyEfficiencyForTrigger) {
458458
efficiency = efficiency * hEfficiencyTrigger->Interpolate(pttrigger, trigg.eta());
@@ -992,11 +992,12 @@ struct correlateStrangeness {
992992
if (std::abs(v0Data.rapidity(index)) < 0.5) {
993993
histos.fill(HIST("h3d") + HIST(v0names[index]) + HIST("SpectrumY"), v0Data.pt(), collision.centFT0M(), v0.invMassNSigma(index), weight);
994994
}
995-
}
996-
if ((-massWindowConfigurations.maxBgNSigma < v0.invMassNSigma(index) && v0.invMassNSigma(index) < -massWindowConfigurations.minBgNSigma) || (+massWindowConfigurations.minBgNSigma < v0.invMassNSigma(index) && v0.invMassNSigma(index) < +massWindowConfigurations.maxBgNSigma))
997-
histos.fill(HIST("h") + HIST(v0names[index]) + HIST("EtaVsPtVsPhiBg"), v0Data.pt(), v0Data.eta(), v0Data.phi(), weight);
998-
if (-massWindowConfigurations.maxPeakNSigma < v0.invMassNSigma(index) && v0.invMassNSigma(index) < +massWindowConfigurations.maxPeakNSigma) {
999-
histos.fill(HIST("h") + HIST(v0names[index]) + HIST("EtaVsPtVsPhi"), v0Data.pt(), v0Data.eta(), v0Data.phi(), weight);
995+
if ((-massWindowConfigurations.maxBgNSigma < v0.invMassNSigma(index) && v0.invMassNSigma(index) < -massWindowConfigurations.minBgNSigma) || (+massWindowConfigurations.minBgNSigma < v0.invMassNSigma(index) && v0.invMassNSigma(index) < +massWindowConfigurations.maxBgNSigma)) {
996+
histos.fill(HIST("h") + HIST(v0names[index]) + HIST("EtaVsPtVsPhiBg"), v0Data.pt(), v0Data.eta(), v0Data.phi(), weight);
997+
}
998+
if (-massWindowConfigurations.maxPeakNSigma < v0.invMassNSigma(index) && v0.invMassNSigma(index) < +massWindowConfigurations.maxPeakNSigma) {
999+
histos.fill(HIST("h") + HIST(v0names[index]) + HIST("EtaVsPtVsPhi"), v0Data.pt(), v0Data.eta(), v0Data.phi(), weight);
1000+
}
10001001
}
10011002
}
10021003
});
@@ -1086,13 +1087,13 @@ struct correlateStrangeness {
10861087
if (std::abs(cascData.rapidity(index)) < 0.5) {
10871088
histos.fill(HIST("h3d") + HIST(cascadenames[index]) + HIST("SpectrumY"), cascData.pt(), collision.centFT0M(), casc.invMassNSigma(index), weight);
10881089
}
1090+
if (-massWindowConfigurations.maxPeakNSigma < casc.invMassNSigma(index) && casc.invMassNSigma(index) < +massWindowConfigurations.maxPeakNSigma) {
1091+
histos.fill(HIST("h") + HIST(cascadenames[index]) + HIST("EtaVsPtVsPhi"), cascData.pt(), cascData.eta(), cascData.phi(), weight);
1092+
}
1093+
if ((-massWindowConfigurations.maxBgNSigma < casc.invMassNSigma(index) && casc.invMassNSigma(index) < -massWindowConfigurations.minBgNSigma) || (+massWindowConfigurations.minBgNSigma < casc.invMassNSigma(index) && casc.invMassNSigma(index) < +massWindowConfigurations.maxBgNSigma)) {
1094+
histos.fill(HIST("h") + HIST(cascadenames[index]) + HIST("EtaVsPtVsPhiBg"), cascData.pt(), cascData.eta(), cascData.phi(), weight);
1095+
}
10891096
}
1090-
if (-massWindowConfigurations.maxPeakNSigma < casc.invMassNSigma(index) && casc.invMassNSigma(index) < +massWindowConfigurations.maxPeakNSigma) {
1091-
histos.fill(HIST("h") + HIST(cascadenames[index]) + HIST("EtaVsPtVsPhi"), cascData.pt(), cascData.eta(), cascData.phi(), weight);
1092-
}
1093-
1094-
if ((-massWindowConfigurations.maxBgNSigma < casc.invMassNSigma(index) && casc.invMassNSigma(index) < -massWindowConfigurations.minBgNSigma) || (+massWindowConfigurations.minBgNSigma < casc.invMassNSigma(index) && casc.invMassNSigma(index) < +massWindowConfigurations.maxBgNSigma))
1095-
histos.fill(HIST("h") + HIST(cascadenames[index]) + HIST("EtaVsPtVsPhiBg"), cascData.pt(), cascData.eta(), cascData.phi(), weight);
10961097
}
10971098
});
10981099
}
@@ -1328,14 +1329,14 @@ struct correlateStrangeness {
13281329
continue;
13291330
}
13301331
Double_t gpt = mcParticle.pt();
1331-
if (abs(mcParticle.pdgCode()) == 211 || abs(mcParticle.pdgCode()) == 321 || abs(mcParticle.pdgCode()) == 2212 || abs(mcParticle.pdgCode()) == 11 || abs(mcParticle.pdgCode()) == 13) {
1332+
if (std::abs(mcParticle.pdgCode()) == 211 || std::abs(mcParticle.pdgCode()) == 321 || std::abs(mcParticle.pdgCode()) == 2212 || std::abs(mcParticle.pdgCode()) == 11 || std::abs(mcParticle.pdgCode()) == 13) {
13321333
if (!doTriggPhysicalPrimary || mcParticle.isPhysicalPrimary()) {
13331334
histos.fill(HIST("hGeneratedQAPtTrigger"), gpt, 0.0f); // step 1: before all selections
13341335
}
13351336
}
13361337

13371338
if (!doAssocPhysicalPrimary || mcParticle.isPhysicalPrimary()) {
1338-
if (abs(mcParticle.pdgCode()) == 310 && doCorrelationK0Short) {
1339+
if (std::abs(mcParticle.pdgCode()) == 310 && doCorrelationK0Short) {
13391340
histos.fill(HIST("hGeneratedQAPtAssociatedK0"), gpt, 0.0f); // step 1: before all selections
13401341
}
13411342
}
@@ -1347,7 +1348,7 @@ struct correlateStrangeness {
13471348
static_for<0, 7>([&](auto i) {
13481349
constexpr int index = i.value;
13491350
if (i == 0 || i == 7) {
1350-
if (abs(mcParticle.pdgCode()) == pdgCodes[i])
1351+
if (std::abs(mcParticle.pdgCode()) == pdgCodes[i])
13511352
histos.fill(HIST("Generated/h") + HIST(particlenames[index]), mcParticle.pt(), mcParticle.eta());
13521353
} else {
13531354
if (mcParticle.pdgCode() == pdgCodes[i])
@@ -1382,12 +1383,12 @@ struct correlateStrangeness {
13821383
for (auto const& mcParticle : mcParticles) {
13831384
if (!mcParticle.isPhysicalPrimary())
13841385
continue;
1385-
if (abs(mcParticle.y()) > 0.5)
1386+
if (std::abs(mcParticle.y()) > 0.5)
13861387
continue;
13871388
static_for<0, 7>([&](auto i) {
13881389
constexpr int index = i.value;
13891390
if (i == 0 || i == 7) {
1390-
if (abs(mcParticle.pdgCode()) == pdgCodes[i])
1391+
if (std::abs(mcParticle.pdgCode()) == pdgCodes[i])
13911392
histos.fill(HIST("GeneratedWithPV/h") + HIST(particlenames[index]) + HIST("_MidYVsMult_TwoPVsOrMore"), mcParticle.pt(), bestCollisionFT0Mpercentile);
13921393
} else {
13931394
if (mcParticle.pdgCode() == pdgCodes[i])
@@ -1421,14 +1422,14 @@ struct correlateStrangeness {
14211422
continue;
14221423
}
14231424
Double_t gpt = mcParticle.pt();
1424-
if (abs(mcParticle.pdgCode()) == 211 || abs(mcParticle.pdgCode()) == 321 || abs(mcParticle.pdgCode()) == 2212 || abs(mcParticle.pdgCode()) == 11 || abs(mcParticle.pdgCode()) == 13) {
1425+
if (std::abs(mcParticle.pdgCode()) == 211 || std::abs(mcParticle.pdgCode()) == 321 || std::abs(mcParticle.pdgCode()) == 2212 || std::abs(mcParticle.pdgCode()) == 11 || std::abs(mcParticle.pdgCode()) == 13) {
14251426
if (!doTriggPhysicalPrimary || mcParticle.isPhysicalPrimary()) {
14261427
histos.fill(HIST("hGeneratedQAPtTrigger"), gpt, 1.0f); // step 2: after event selection
14271428
}
14281429
}
14291430

14301431
if (!doAssocPhysicalPrimary || mcParticle.isPhysicalPrimary()) {
1431-
if (abs(mcParticle.pdgCode()) == 310 && doCorrelationK0Short) {
1432+
if (std::abs(mcParticle.pdgCode()) == 310 && doCorrelationK0Short) {
14321433
histos.fill(HIST("hGeneratedQAPtAssociatedK0"), gpt, 1.0f); // step 2: before all selections
14331434
}
14341435
}
@@ -1440,21 +1441,21 @@ struct correlateStrangeness {
14401441
}
14411442
Double_t geta = mcParticle.eta();
14421443
Double_t gpt = mcParticle.pt();
1443-
if (abs(mcParticle.pdgCode()) == 211 || abs(mcParticle.pdgCode()) == 321 || abs(mcParticle.pdgCode()) == 2212 || abs(mcParticle.pdgCode()) == 11 || abs(mcParticle.pdgCode()) == 13)
1444+
if (std::abs(mcParticle.pdgCode()) == 211 || std::abs(mcParticle.pdgCode()) == 321 || std::abs(mcParticle.pdgCode()) == 2212 || std::abs(mcParticle.pdgCode()) == 11 || std::abs(mcParticle.pdgCode()) == 13)
14441445
histos.fill(HIST("GeneratedWithPV/hTrigger"), gpt, geta);
14451446
static_for<0, 7>([&](auto i) {
14461447
constexpr int index = i.value;
14471448
if (i == 0 || i == 7) {
1448-
if (abs(mcParticle.pdgCode()) == pdgCodes[i]) {
1449+
if (std::abs(mcParticle.pdgCode()) == pdgCodes[i]) {
14491450
histos.fill(HIST("GeneratedWithPV/h") + HIST(particlenames[index]), gpt, geta);
1450-
if (abs(mcParticle.y()) < 0.5)
1451+
if (std::abs(mcParticle.y()) < 0.5)
14511452
histos.fill(HIST("GeneratedWithPV/h") + HIST(particlenames[index]) + HIST("_MidYVsMult"), gpt, bestCollisionFT0Mpercentile);
14521453
}
14531454

14541455
} else {
14551456
if (mcParticle.pdgCode() == pdgCodes[i]) {
14561457
histos.fill(HIST("GeneratedWithPV/h") + HIST(particlenames[index]), gpt, geta);
1457-
if (abs(mcParticle.y()) < 0.5)
1458+
if (std::abs(mcParticle.y()) < 0.5)
14581459
histos.fill(HIST("GeneratedWithPV/h") + HIST(particlenames[index]) + HIST("_MidYVsMult"), gpt, bestCollisionFT0Mpercentile);
14591460
}
14601461
}
@@ -1481,14 +1482,14 @@ struct correlateStrangeness {
14811482
continue;
14821483
}
14831484
Double_t gpt = mcParticle.pt();
1484-
if (abs(mcParticle.pdgCode()) == 211 || abs(mcParticle.pdgCode()) == 321 || abs(mcParticle.pdgCode()) == 2212 || abs(mcParticle.pdgCode()) == 11 || abs(mcParticle.pdgCode()) == 13) {
1485+
if (std::abs(mcParticle.pdgCode()) == 211 || std::abs(mcParticle.pdgCode()) == 321 || std::abs(mcParticle.pdgCode()) == 2212 || std::abs(mcParticle.pdgCode()) == 11 || std::abs(mcParticle.pdgCode()) == 13) {
14851486
if (!doTriggPhysicalPrimary || mcParticle.isPhysicalPrimary()) {
14861487
histos.fill(HIST("hClosureQAPtTrigger"), gpt, 0.0f); // step 1: no event selection whatsoever
14871488
}
14881489
}
14891490

14901491
if (!doAssocPhysicalPrimary || mcParticle.isPhysicalPrimary()) {
1491-
if (abs(mcParticle.pdgCode()) == 310 && doCorrelationK0Short) {
1492+
if (std::abs(mcParticle.pdgCode()) == 310 && doCorrelationK0Short) {
14921493
histos.fill(HIST("hClosureQAPtAssociatedK0"), gpt, 0.0f); // step 1: no event selection whatsoever
14931494
}
14941495
}
@@ -1540,14 +1541,14 @@ struct correlateStrangeness {
15401541
continue;
15411542
}
15421543
Double_t gpt = mcParticle.pt();
1543-
if (abs(mcParticle.pdgCode()) == 211 || abs(mcParticle.pdgCode()) == 321 || abs(mcParticle.pdgCode()) == 2212 || abs(mcParticle.pdgCode()) == 11 || abs(mcParticle.pdgCode()) == 13) {
1544+
if (std::abs(mcParticle.pdgCode()) == 211 || std::abs(mcParticle.pdgCode()) == 321 || std::abs(mcParticle.pdgCode()) == 2212 || std::abs(mcParticle.pdgCode()) == 11 || std::abs(mcParticle.pdgCode()) == 13) {
15441545
if (!doTriggPhysicalPrimary || mcParticle.isPhysicalPrimary()) {
15451546
histos.fill(HIST("hClosureQAPtTrigger"), gpt, 1.0f); // step 2: after event selection
15461547
}
15471548
}
15481549

15491550
if (!doAssocPhysicalPrimary || mcParticle.isPhysicalPrimary()) {
1550-
if (abs(mcParticle.pdgCode()) == 310 && doCorrelationK0Short) {
1551+
if (std::abs(mcParticle.pdgCode()) == 310 && doCorrelationK0Short) {
15511552
histos.fill(HIST("hClosureQAPtAssociatedK0"), gpt, 1.0f); // step 2: after event selection
15521553
}
15531554
}
@@ -1562,18 +1563,18 @@ struct correlateStrangeness {
15621563
if (std::abs(geta) > 0.8f) {
15631564
continue;
15641565
}
1565-
if (abs(mcParticle.pdgCode()) == 211 || abs(mcParticle.pdgCode()) == 321 || abs(mcParticle.pdgCode()) == 2212 || abs(mcParticle.pdgCode()) == 11 || abs(mcParticle.pdgCode()) == 13) {
1566+
if (std::abs(mcParticle.pdgCode()) == 211 || std::abs(mcParticle.pdgCode()) == 321 || std::abs(mcParticle.pdgCode()) == 2212 || std::abs(mcParticle.pdgCode()) == 11 || std::abs(mcParticle.pdgCode()) == 13) {
15661567
if (!doTriggPhysicalPrimary || mcParticle.isPhysicalPrimary()) {
15671568
triggerIndices.emplace_back(iteratorNum);
15681569
histos.fill(HIST("ClosureTest/hTrigger"), gpt, geta, bestCollisionFT0Mpercentile);
15691570
}
15701571
}
15711572
if (!doAssocPhysicalPrimary || mcParticle.isPhysicalPrimary()) {
1572-
if (abs(mcParticle.pdgCode()) == 211 && doCorrelationPion) {
1573+
if (std::abs(mcParticle.pdgCode()) == 211 && doCorrelationPion) {
15731574
piIndices.emplace_back(iteratorNum);
15741575
histos.fill(HIST("ClosureTest/hPion"), gpt, geta, gphi);
15751576
}
1576-
if (abs(mcParticle.pdgCode()) == 310 && doCorrelationK0Short) {
1577+
if (std::abs(mcParticle.pdgCode()) == 310 && doCorrelationK0Short) {
15771578
k0ShortIndices.emplace_back(iteratorNum);
15781579
histos.fill(HIST("ClosureTest/hK0Short"), gpt, geta, gphi);
15791580
}

0 commit comments

Comments
 (0)