Skip to content

Commit 238dd1a

Browse files
RD0407RD0407
authored
Update spectraTOF.cxx (#5544)
* Update spectraTOF.cxx Memory is reduced by replacing generated and reconstructed particle hists from THnSparse to TH3D * Update spectraTOF.cxx
1 parent 2871102 commit 238dd1a

File tree

1 file changed

+27
-26
lines changed

1 file changed

+27
-26
lines changed

‎PWGLF/Tasks/Nuspex/spectraTOF.cxx‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ struct tofSpectra {
8383
Configurable<float> maxDcaZ{"maxDcaZ", 2.f, "Additional cut on the maximum value of the DCA z"};
8484
Configurable<float> minTPCNClsFound{"minTPCNClsFound", 0.f, "Additional cut on the minimum value of the number of found clusters in the TPC"};
8585
Configurable<bool> makeTHnSparseChoice{"makeTHnSparseChoice", false, "choose if produce thnsparse"}; // RD
86+
Configurable<bool> includeCentralityMC{"includeCentralityMC", true, "choose if include Centrality to MC"};
8687
Configurable<bool> tpctofVsMult{"tpctofVsMult", false, "Produce TPC-TOF plots vs multiplicity"};
8788
Configurable<bool> removeTFBorder{"removeTFBorder", false, "Remove TF border"};
8889

@@ -478,26 +479,26 @@ struct tofSpectra {
478479
}
479480

480481
if (doprocessMC) {
481-
if (makeTHnSparseChoice) {
482+
if (includeCentralityMC) {
482483
//*************************************RD**********************************************
483484

484-
histos.add(hpt_num_prm[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
485-
histos.add(hpt_num_str[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
486-
histos.add(hpt_num_mat[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
485+
histos.add(hpt_num_prm[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
486+
histos.add(hpt_num_str[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
487+
histos.add(hpt_num_mat[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
487488

488-
histos.add(hpt_numtof_prm[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
489-
histos.add(hpt_numtof_str[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
490-
histos.add(hpt_numtof_mat[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
489+
histos.add(hpt_numtof_prm[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
490+
histos.add(hpt_numtof_str[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
491+
histos.add(hpt_numtof_mat[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
491492

492-
histos.add(hpt_den_prm[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
493-
histos.add(hpt_den_str[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
494-
histos.add(hpt_den_mat[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
493+
histos.add(hpt_den_prm[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
494+
histos.add(hpt_den_str[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
495+
histos.add(hpt_den_mat[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
495496

496-
histos.add(hpt_den_prm_recoev[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
497-
histos.add(hpt_den_prm_evsel[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
498-
histos.add(hpt_den_prm_goodev[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
499-
histos.add(hpt_den_prm_mcgoodev[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
500-
histos.add(hpt_den_prm_mcbadev[i].data(), pTCharge[i], kTHnSparseD, {ptAxis, multAxis, etaAxis});
497+
histos.add(hpt_den_prm_recoev[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
498+
histos.add(hpt_den_prm_evsel[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
499+
histos.add(hpt_den_prm_goodev[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
500+
histos.add(hpt_den_prm_mcgoodev[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
501+
histos.add(hpt_den_prm_mcbadev[i].data(), pTCharge[i], kTH3D, {ptAxis, multAxis, etaAxis});
501502
//***************************************************************************************
502503
} else {
503504
histos.add(hpt_num_prm[i].data(), pTCharge[i], kTH1D, {ptAxis});
@@ -1338,7 +1339,7 @@ struct tofSpectra {
13381339

13391340
if (!mcParticle.isPhysicalPrimary()) {
13401341
if (mcParticle.getProcess() == 4) {
1341-
if (makeTHnSparseChoice) {
1342+
if (includeCentralityMC) {
13421343
histos.fill(HIST(hpt_num_str[i]), track.pt(), multiplicity, track.eta()); // RD
13431344
if (track.hasTOF()) {
13441345
histos.fill(HIST(hpt_numtof_str[i]), track.pt(), multiplicity, track.eta()); // RD
@@ -1350,7 +1351,7 @@ struct tofSpectra {
13501351
}
13511352
}
13521353
} else {
1353-
if (makeTHnSparseChoice) {
1354+
if (includeCentralityMC) {
13541355
histos.fill(HIST(hpt_num_mat[i]), track.pt(), multiplicity, track.eta()); // RD
13551356
if (track.hasTOF()) {
13561357
histos.fill(HIST(hpt_numtof_mat[i]), track.pt(), multiplicity, track.eta()); // RD
@@ -1364,7 +1365,7 @@ struct tofSpectra {
13641365
}
13651366
}
13661367
} else {
1367-
if (makeTHnSparseChoice) {
1368+
if (includeCentralityMC) {
13681369
histos.fill(HIST(hpt_num_prm[i]), track.pt(), multiplicity, track.eta()); // RD
13691370
} else {
13701371
histos.fill(HIST(hpt_num_prm[i]), track.pt());
@@ -1382,7 +1383,7 @@ struct tofSpectra {
13821383
}
13831384
}
13841385
if (track.hasTOF()) {
1385-
if (makeTHnSparseChoice) {
1386+
if (includeCentralityMC) {
13861387
histos.fill(HIST(hpt_numtof_prm[i]), track.pt(), multiplicity, track.eta()); // RD
13871388
} else {
13881389
histos.fill(HIST(hpt_numtof_prm[i]), track.pt());
@@ -1473,20 +1474,20 @@ struct tofSpectra {
14731474
const float multiplicity = getMultiplicity(collision);
14741475
if (!mcParticle.isPhysicalPrimary()) {
14751476
if (mcParticle.getProcess() == 4) {
1476-
if (makeTHnSparseChoice) {
1477+
if (includeCentralityMC) {
14771478
histos.fill(HIST(hpt_den_str[i]), mcParticle.pt(), multiplicity, mcParticle.eta()); // RD
14781479
} else {
14791480
histos.fill(HIST(hpt_den_str[i]), mcParticle.pt());
14801481
}
14811482
} else {
1482-
if (makeTHnSparseChoice) {
1483+
if (includeCentralityMC) {
14831484
histos.fill(HIST(hpt_den_mat[i]), mcParticle.pt(), multiplicity, mcParticle.eta()); // RD
14841485
} else {
14851486
histos.fill(HIST(hpt_den_mat[i]), mcParticle.pt());
14861487
}
14871488
}
14881489
} else {
1489-
if (makeTHnSparseChoice) {
1490+
if (includeCentralityMC) {
14901491
histos.fill(HIST(hpt_den_prm[i]), mcParticle.pt(), multiplicity, mcParticle.eta()); // RD
14911492
} else {
14921493
histos.fill(HIST(hpt_den_prm[i]), mcParticle.pt());
@@ -1564,20 +1565,20 @@ struct tofSpectra {
15641565
if (mcParticle.isPhysicalPrimary()) {
15651566
if (collision.sel8()) {
15661567
if (abs(collision.posZ()) < cfgCutVertex) {
1567-
if (makeTHnSparseChoice) {
1568+
if (includeCentralityMC) {
15681569
histos.fill(HIST(hpt_den_prm_goodev[i]), mcParticle.pt(), multiplicity, mcParticle.eta());
15691570
} else {
15701571
histos.fill(HIST(hpt_den_prm_goodev[i]), mcParticle.pt());
15711572
}
15721573
} else {
1573-
if (makeTHnSparseChoice) {
1574+
if (includeCentralityMC) {
15741575
histos.fill(HIST(hpt_den_prm_evsel[i]), mcParticle.pt(), multiplicity, mcParticle.eta());
15751576
} else {
15761577
histos.fill(HIST(hpt_den_prm_evsel[i]), mcParticle.pt());
15771578
}
15781579
}
15791580
} else {
1580-
if (makeTHnSparseChoice) {
1581+
if (includeCentralityMC) {
15811582
histos.fill(HIST(hpt_den_prm_recoev[i]), mcParticle.pt(), multiplicity, mcParticle.eta());
15821583
} else {
15831584
histos.fill(HIST(hpt_den_prm_recoev[i]), mcParticle.pt());
@@ -1706,7 +1707,7 @@ struct tofSpectra {
17061707
fillTrackHistograms_MC<i>(track, mcParticle, track.collision_as<CollisionCandidateMC>());
17071708
});
17081709
}
1709-
if (makeTHnSparseChoice) {
1710+
if (includeCentralityMC) {
17101711
for (const auto& collision : collisions) {
17111712
if (!collision.has_mcCollision()) {
17121713
continue;

0 commit comments

Comments
 (0)