Skip to content

Commit 35ed599

Browse files
lietavalietava
committed
fixes in dNdeta
1 parent fe87979 commit 35ed599

File tree

2 files changed

+32
-19
lines changed

2 files changed

+32
-19
lines changed

‎PWGLF/DataModel/LFNonPromptCascadeTables.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ DECLARE_SOA_TABLE(NPCascTable, "AOD", "NPCASCTABLE",
195195
NPCascadeTable::CentFT0M,
196196
NPCascadeTable::MultNTracksGlobal,
197197
NPCascadeTable::ToiMask,
198-
NPCascadeTable::NoSameBunchPileup)
198+
NPCascadeTable::NoSameBunchPileup);
199199

200200
DECLARE_SOA_TABLE(NPCascTableNT, "AOD", "NPCASCTABLENT",
201201
NPCascadeTable::RunNumber,
@@ -263,7 +263,7 @@ DECLARE_SOA_TABLE(NPCascTableNT, "AOD", "NPCASCTABLENT",
263263
NPCascadeTable::CentFT0M,
264264
NPCascadeTable::MultNTracksGlobal,
265265
NPCascadeTable::ToiMask,
266-
NPCascadeTable::NoSameBunchPileup)
266+
NPCascadeTable::NoSameBunchPileup);
267267

268268
DECLARE_SOA_TABLE(NPCascTableMC, "AOD", "NPCASCTABLEMC",
269269
NPCascadeTable::RunNumber,
@@ -350,7 +350,7 @@ DECLARE_SOA_TABLE(NPCascTableMC, "AOD", "NPCASCTABLEMC",
350350
NPCascadeTable::MotherDecayDaughters,
351351
NPCascadeTable::MultNTracksGlobal,
352352
NPCascadeTable::ToiMask,
353-
NPCascadeTable::NoSameBunchPileup)
353+
NPCascadeTable::NoSameBunchPileup);
354354

355355
DECLARE_SOA_TABLE(NPCascTableMCNT, "AOD", "NPCASCTABLEMCNT",
356356
NPCascadeTable::RunNumber,
@@ -437,7 +437,7 @@ DECLARE_SOA_TABLE(NPCascTableMCNT, "AOD", "NPCASCTABLEMCNT",
437437
NPCascadeTable::MotherDecayDaughters,
438438
NPCascadeTable::MultNTracksGlobal,
439439
NPCascadeTable::ToiMask,
440-
NPCascadeTable::NoSameBunchPileup)
440+
NPCascadeTable::NoSameBunchPileup);
441441
DECLARE_SOA_TABLE(NPCascTableGen, "AOD", "NPCASCTABLEGen",
442442
NPCascadeTable::gPt,
443443
NPCascadeTable::gEta,
@@ -449,21 +449,21 @@ DECLARE_SOA_TABLE(NPCascTableGen, "AOD", "NPCASCTABLEGen",
449449
NPCascadeTable::DCAzMC,
450450
NPCascadeTable::IsFromBeauty,
451451
NPCascadeTable::IsFromCharm,
452-
NPCascadeTable::MotherDecayDaughters)
452+
NPCascadeTable::MotherDecayDaughters);
453+
DECLARE_SOA_TABLE(NPMCChargedTable, "AOD", "NPMCChargedTABLE",
454+
NPCascadeTable::PtGen,
455+
NPCascadeTable::PtRec,
456+
NPCascadeTable::MultNTracksGlobal,
457+
NPCascadeTable::MultGen);
453458
DECLARE_SOA_TABLE(NPCollisionTable, "AOD", "NPCollisionTABLE",
454459
NPCascadeTable::RunNumber,
455460
NPCascadeTable::GlobalBC,
456461
aod::collision::NumContrib,
457462
NPCascadeTable::MultNTracksGlobal,
458463
NPCascadeTable::CentFT0M,
459464
NPCascadeTable::MultFT0M);
460-
DECLARE_SOA_TABLE(NPMCChargedTable, "AOD", "NPMCChargedTABLE",
461-
NPCascadeTable::PtGen,
462-
NPCascadeTable::PtRec,
463-
NPCascadeTable::MultNTracksGlobal,
464-
NPCascadeTable::MultGen);
465465
DECLARE_SOA_INDEX_COLUMN_FULL(NPCollision, npCollision, int32_t, NPCollisionTable, "");
466-
DECLARE_SOA_TABLE(NPRecoChargedCandidate, "AOD", "NPRecoChargedCandidate",
466+
DECLARE_SOA_TABLE(NPRecoChargedCand, "AOD", "NPRecoChargedCand",
467467
NPCollisionId,
468468
NPCascadeTable::PtRec);
469469
} // namespace o2::aod

‎PWGLF/Tasks/Strangeness/nonPromptCascade.cxx‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ struct NonPromptCascadeTask {
185185
//
186186
Produces<o2::aod::NPCollisionTable> NPCollsTable;
187187
Produces<o2::aod::NPMCChargedTable> NPMCNTable;
188-
Produces<o2::aod::NPRecoChargedCandidate> NPRecoCandTable;
188+
Produces<o2::aod::NPRecoChargedCand> NPRecoCandTable;
189189

190190
using TracksExtData = soa::Join<aod::TracksIU, aod::TracksCovIU, aod::TracksExtra, aod::pidTPCFullKa, aod::pidTPCFullPi, aod::pidTPCFullPr, aod::pidTOFFullKa, aod::pidTOFFullPi, aod::pidTOFFullPr>;
191191
using TracksExtMC = soa::Join<aod::TracksIU, aod::TracksCovIU, aod::TracksExtra, aod::McTrackLabels, aod::pidTPCFullKa, aod::pidTPCFullPi, aod::pidTPCFullPr, aod::pidTOFFullKa, aod::pidTOFFullPi, aod::pidTOFFullPr>;
@@ -196,6 +196,7 @@ struct NonPromptCascadeTask {
196196

197197
Preslice<TracksExtData> perCollision = aod::track::collisionId;
198198
Preslice<TracksExtMC> perCollisionMC = aod::track::collisionId;
199+
Preslice<TracksWithSel> perCollisionSel = aod::track::collisionId;
199200

200201
HistogramRegistry mRegistry;
201202

@@ -331,8 +332,9 @@ struct NonPromptCascadeTask {
331332
// dN/deta
332333
//
333334
bool runMCdNdeta = context.options().get<bool>("processdNdetaMC");
335+
bool rundNdeta = context.options().get<bool>("processdNdeta");
334336
// std::cout << "runMCdNdeta: " << runMCdNdeta << std::endl;
335-
if (runMCdNdeta) {
337+
if (runMCdNdeta || rundNdeta) {
336338
std::vector<double> ptBins;
337339
std::vector<std::string> tokens = o2::utils::Str::tokenize(cfgPtEdgesdNdeta, ',');
338340
for (auto const& pts : tokens) {
@@ -344,13 +346,14 @@ struct NonPromptCascadeTask {
344346
}
345347
ptBins.push_back(pt);
346348
}
347-
AxisSpec ptAxisMC{ptBins, "pT MC"};
348349
AxisSpec ptAxisReco{ptBins, "pT Reco"};
350+
AxisSpec ptAxisMC{ptBins, "pT MC"};
349351

350352
// multMeasured, multMC, ptMeasured, ptMC
351353
mRegistrydNdeta.add("hdNdetaRM/hdNdetaRM", "hdNdetaRM", HistType::kTHnSparseF, {nTracksAxisMC, nTracksAxis, ptAxisMC, ptAxisReco});
352354
mRegistrydNdeta.add("hdNdetaRM/hdNdetaRMNotInRecoCol", "hdNdetaRMNotInRecoCol", HistType::kTHnSparseF, {nTracksAxisMC, ptAxisMC});
353355
mRegistrydNdeta.add("hdNdetaRM/hdNdetaRMNotInRecoTrk", "hdNdetaRMNotInRecoTrk", HistType::kTHnSparseF, {nTracksAxisMC, ptAxisMC});
356+
mRegistrydNdeta.add("hdNdetaData", "hdNdetaData", HistType::kTH1F, {nTracksAxis});
354357
}
355358
}
356359

@@ -810,6 +813,10 @@ struct NonPromptCascadeTask {
810813
aod::McParticles const& mcParticles,
811814
TracksWithLabel const& tracks)
812815
{
816+
//------------------------------------------------------------
817+
// Downscaling output table by BC as there is no pileup in MC
818+
//------------------------------------------------------------
819+
int ds = 1;
813820
//-------------------------------------------------------------
814821
// MC mult for all MC coll
815822
//--------------------------------------------------------------
@@ -952,7 +959,9 @@ struct NonPromptCascadeTask {
952959
const float ptMC = mcPar.pt();
953960

954961
mRegistrydNdeta.fill(HIST("hdNdetaRM/hdNdetaRM"), mult, multReco, ptMC, ptReco);
955-
NPMCNTable(ptMC, ptReco, mult, multReco);
962+
if(ds % cfgDownscaleMB == 0) {
963+
NPMCNTable(ptMC, ptReco, mult, multReco);
964+
}
956965
}
957966

958967
// ------------------------------------------------------------
@@ -983,7 +992,7 @@ struct NonPromptCascadeTask {
983992

984993
PROCESS_SWITCH(NonPromptCascadeTask, processdNdetaMC, "process mc dN/deta", false);
985994
//
986-
void processdNdeta(CollisionCandidatesRun3 const& collisions, TracksWithSel const& tracks)
995+
void processdNdeta(CollisionCandidatesRun3 const& collisions, TracksWithSel const& tracks, aod::BCsWithTimestamps const&)
987996
{
988997
int ds = 1;
989998
uint32_t orbitO = 0;
@@ -1006,22 +1015,26 @@ struct NonPromptCascadeTask {
10061015
mRunNumber = bc.runNumber();
10071016
}
10081017
NPCollsTable(mRunNumber,
1009-
coll.bc().globalBC(),
1018+
globalBC,
10101019
coll.numContrib(),
10111020
coll.multNTracksGlobal(),
10121021
coll.centFT0M(),
10131022
coll.multFT0M());
10141023

10151024
auto collIdx = NPCollsTable.lastIndex();
1016-
auto tracksThisColl = tracks.sliceBy(perCollision, coll.globalIndex());
1025+
auto tracksThisColl = tracks.sliceBy(perCollisionSel, coll.globalIndex());
1026+
float multreco = 0.;
1027+
// std::cout << "tracks:" << tracksThisColl.size() << std::endl;
10171028
for (auto const& track : tracksThisColl) {
1029+
// std::cout << track.pt() << " tracks " << track.isGlobalTrack() << std::endl;
10181030
if (std::fabs(track.eta()) < 0.8 && track.tpcNClsFound() >= 80 && track.tpcNClsCrossedRows() >= 100) {
10191031
if (track.isGlobalTrack()) {
1020-
// mults.multGlobalTracks++;
1032+
multreco++;
10211033
NPRecoCandTable(collIdx, track.pt());
10221034
}
10231035
}
10241036
}
1037+
mRegistrydNdeta.fill(HIST("hdNdetaData"), multreco);
10251038
}
10261039
}
10271040
}

0 commit comments

Comments
 (0)