Skip to content

Commit f4f4e5b

Browse files
author
Laura Serksnyte
committed
Create derived data from derived data to have only signal events for mixing
1 parent 89c41af commit f4f4e5b

File tree

5 files changed

+305
-74
lines changed

5 files changed

+305
-74
lines changed

‎PWGCF/DataModel/FemtoDerived.h‎

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ DECLARE_SOA_COLUMN(BitMaskTrackThree, bitmaskTrackThree, BitMaskType); //! Bit f
5252
DECLARE_SOA_COLUMN(Downsample, downsample, bool); //! Flag for downsampling
5353
} // namespace femtodreamcollision
5454

55-
DECLARE_SOA_TABLE(FDCollisions, "AOD", "FDCOLLISION",
56-
o2::soa::Index<>,
57-
o2::aod::collision::PosZ,
58-
femtodreamcollision::MultV0M,
59-
femtodreamcollision::MultNtr,
60-
femtodreamcollision::Sphericity,
61-
femtodreamcollision::MagField);
55+
DECLARE_SOA_TABLE_STAGED(FDCollisions, "FDCOLLISION",
56+
o2::soa::Index<>,
57+
o2::aod::collision::PosZ,
58+
femtodreamcollision::MultV0M,
59+
femtodreamcollision::MultNtr,
60+
femtodreamcollision::Sphericity,
61+
femtodreamcollision::MagField);
6262
using FDCollision = FDCollisions::iterator;
6363

6464
DECLARE_SOA_TABLE(FDColMasks, "AOD", "FDCOLMASK",
@@ -74,16 +74,16 @@ namespace femtodreamMCcollision
7474
DECLARE_SOA_COLUMN(MultMCgenPartEta08, multMCgenPartEta08, int); //! Multiplicity of the event as given by the generator in |eta|<0.8
7575
}
7676

77-
DECLARE_SOA_TABLE(FDMCCollisions, "AOD", "FDMCCOLLISION",
78-
o2::soa::Index<>,
79-
femtodreamMCcollision::MultMCgenPartEta08);
77+
DECLARE_SOA_TABLE_STAGED(FDMCCollisions, "FDMCCOLLISION",
78+
o2::soa::Index<>,
79+
femtodreamMCcollision::MultMCgenPartEta08);
8080
using FDMCCollision = FDMCCollisions::iterator;
8181

8282
namespace mcfdcolllabel
8383
{
8484
DECLARE_SOA_INDEX_COLUMN(FDMCCollision, fdMCCollision); //! MC collision for femtodreamcollision
8585
}
86-
DECLARE_SOA_TABLE(FDMCCollLabels, "AOD", "FDMCCollLabel", mcfdcolllabel::FDMCCollisionId);
86+
DECLARE_SOA_TABLE_STAGED(FDMCCollLabels, "FDMCCollLabel", mcfdcolllabel::FDMCCollisionId);
8787

8888
/// FemtoDreamTrack
8989
namespace femtodreamparticle
@@ -313,59 +313,59 @@ DECLARE_SOA_TABLE(FDParticlesIndex, "AOD", "FDPARTICLEINDEX", //! Table track in
313313
o2::soa::Index<>,
314314
fdhf::TrackId);
315315

316-
DECLARE_SOA_TABLE(FDParticles, "AOD", "FDPARTICLE",
317-
o2::soa::Index<>,
318-
femtodreamparticle::FDCollisionId,
319-
femtodreamparticle::Pt,
320-
femtodreamparticle::Eta,
321-
femtodreamparticle::Phi,
322-
femtodreamparticle::PartType,
323-
femtodreamparticle::Cut,
324-
femtodreamparticle::PIDCut,
325-
femtodreamparticle::TempFitVar,
326-
femtodreamparticle::ChildrenIds,
327-
femtodreamparticle::MLambda,
328-
femtodreamparticle::MAntiLambda,
329-
femtodreamparticle::Theta<femtodreamparticle::Eta>,
330-
femtodreamparticle::Px<femtodreamparticle::Pt, femtodreamparticle::Phi>,
331-
femtodreamparticle::Py<femtodreamparticle::Pt, femtodreamparticle::Phi>,
332-
femtodreamparticle::Pz<femtodreamparticle::Pt, femtodreamparticle::Eta>,
333-
femtodreamparticle::P<femtodreamparticle::Pt, femtodreamparticle::Eta>);
316+
DECLARE_SOA_TABLE_STAGED(FDParticles, "FDPARTICLE",
317+
o2::soa::Index<>,
318+
femtodreamparticle::FDCollisionId,
319+
femtodreamparticle::Pt,
320+
femtodreamparticle::Eta,
321+
femtodreamparticle::Phi,
322+
femtodreamparticle::PartType,
323+
femtodreamparticle::Cut,
324+
femtodreamparticle::PIDCut,
325+
femtodreamparticle::TempFitVar,
326+
femtodreamparticle::ChildrenIds,
327+
femtodreamparticle::MLambda,
328+
femtodreamparticle::MAntiLambda,
329+
femtodreamparticle::Theta<femtodreamparticle::Eta>,
330+
femtodreamparticle::Px<femtodreamparticle::Pt, femtodreamparticle::Phi>,
331+
femtodreamparticle::Py<femtodreamparticle::Pt, femtodreamparticle::Phi>,
332+
femtodreamparticle::Pz<femtodreamparticle::Pt, femtodreamparticle::Eta>,
333+
femtodreamparticle::P<femtodreamparticle::Pt, femtodreamparticle::Eta>);
334334
using FDParticle = FDParticles::iterator;
335335

336-
DECLARE_SOA_TABLE(FDExtParticles, "AOD", "FDEXTPARTICLE",
337-
femtodreamparticle::Sign,
338-
femtodreamparticle::TPCNClsFound,
339-
track::TPCNClsFindable,
340-
femtodreamparticle::TPCNClsCrossedRows,
341-
track::TPCNClsShared,
342-
track::TPCInnerParam,
343-
femtodreamparticle::ITSNCls,
344-
femtodreamparticle::ITSNClsInnerBarrel,
345-
track::DcaXY,
346-
track::DcaZ,
347-
track::TPCSignal,
348-
femtodreamparticle::TPCNSigmaEl,
349-
femtodreamparticle::TPCNSigmaPi,
350-
femtodreamparticle::TPCNSigmaKa,
351-
femtodreamparticle::TPCNSigmaPr,
352-
femtodreamparticle::TPCNSigmaDe,
353-
femtodreamparticle::TPCNSigmaTr,
354-
femtodreamparticle::TPCNSigmaHe,
355-
femtodreamparticle::TOFNSigmaEl,
356-
femtodreamparticle::TOFNSigmaPi,
357-
femtodreamparticle::TOFNSigmaKa,
358-
femtodreamparticle::TOFNSigmaPr,
359-
femtodreamparticle::TOFNSigmaDe,
360-
femtodreamparticle::TOFNSigmaTr,
361-
femtodreamparticle::TOFNSigmaHe,
362-
femtodreamparticle::DaughDCA,
363-
femtodreamparticle::TransRadius,
364-
femtodreamparticle::DecayVtxX,
365-
femtodreamparticle::DecayVtxY,
366-
femtodreamparticle::DecayVtxZ,
367-
femtodreamparticle::MKaon,
368-
femtodreamparticle::TPCCrossedRowsOverFindableCls<track::TPCNClsFindable, femtodreamparticle::TPCNClsCrossedRows>)
336+
DECLARE_SOA_TABLE_STAGED(FDExtParticles, "FDEXTPARTICLE",
337+
femtodreamparticle::Sign,
338+
femtodreamparticle::TPCNClsFound,
339+
track::TPCNClsFindable,
340+
femtodreamparticle::TPCNClsCrossedRows,
341+
track::TPCNClsShared,
342+
track::TPCInnerParam,
343+
femtodreamparticle::ITSNCls,
344+
femtodreamparticle::ITSNClsInnerBarrel,
345+
track::DcaXY,
346+
track::DcaZ,
347+
track::TPCSignal,
348+
femtodreamparticle::TPCNSigmaEl,
349+
femtodreamparticle::TPCNSigmaPi,
350+
femtodreamparticle::TPCNSigmaKa,
351+
femtodreamparticle::TPCNSigmaPr,
352+
femtodreamparticle::TPCNSigmaDe,
353+
femtodreamparticle::TPCNSigmaTr,
354+
femtodreamparticle::TPCNSigmaHe,
355+
femtodreamparticle::TOFNSigmaEl,
356+
femtodreamparticle::TOFNSigmaPi,
357+
femtodreamparticle::TOFNSigmaKa,
358+
femtodreamparticle::TOFNSigmaPr,
359+
femtodreamparticle::TOFNSigmaDe,
360+
femtodreamparticle::TOFNSigmaTr,
361+
femtodreamparticle::TOFNSigmaHe,
362+
femtodreamparticle::DaughDCA,
363+
femtodreamparticle::TransRadius,
364+
femtodreamparticle::DecayVtxX,
365+
femtodreamparticle::DecayVtxY,
366+
femtodreamparticle::DecayVtxZ,
367+
femtodreamparticle::MKaon,
368+
femtodreamparticle::TPCCrossedRowsOverFindableCls<track::TPCNClsFindable, femtodreamparticle::TPCNClsCrossedRows>)
369369
using FDFullParticle = FDExtParticles::iterator;
370370

371371
/// FemtoDreamTrackMC
@@ -411,25 +411,25 @@ DECLARE_SOA_COLUMN(PDGMCTruth, pdgMCTruth, int); //! Particle
411411
DECLARE_SOA_COLUMN(MotherPDG, motherPDG, int); //! Checks mother PDG, where mother is the primary particle for that decay chain
412412
} // namespace femtodreamMCparticle
413413

414-
DECLARE_SOA_TABLE(FDMCParticles, "AOD", "FDMCPARTICLE",
415-
o2::soa::Index<>,
416-
femtodreamMCparticle::PartOriginMCTruth,
417-
femtodreamMCparticle::PDGMCTruth,
418-
femtodreamparticle::Pt,
419-
femtodreamparticle::Eta,
420-
femtodreamparticle::Phi);
414+
DECLARE_SOA_TABLE_STAGED(FDMCParticles, "FDMCPARTICLE",
415+
o2::soa::Index<>,
416+
femtodreamMCparticle::PartOriginMCTruth,
417+
femtodreamMCparticle::PDGMCTruth,
418+
femtodreamparticle::Pt,
419+
femtodreamparticle::Eta,
420+
femtodreamparticle::Phi);
421421
using FDMCParticle = FDMCParticles::iterator;
422422

423-
DECLARE_SOA_TABLE(FDExtMCParticles, "AOD", "FDEXTMCPARTICLE",
424-
femtodreamMCparticle::MotherPDG);
423+
DECLARE_SOA_TABLE_STAGED(FDExtMCParticles, "FDEXTMCPARTICLE",
424+
femtodreamMCparticle::MotherPDG);
425425
using FDExtMCParticle = FDExtMCParticles::iterator;
426426

427427
namespace mcfdlabel
428428
{
429429
DECLARE_SOA_INDEX_COLUMN(FDMCParticle, fdMCParticle); //! MC particle for femtodreamparticle
430430
} // namespace mcfdlabel
431-
DECLARE_SOA_TABLE(FDMCLabels, "AOD", "FDMCLabel", //! Table joinable to FemtoDreamParticle containing the MC labels
432-
mcfdlabel::FDMCParticleId);
431+
DECLARE_SOA_TABLE_STAGED(FDMCLabels, "FDMCLabel", //! Table joinable to FemtoDreamParticle containing the MC labels
432+
mcfdlabel::FDMCParticleId);
433433
namespace mcfdextlabel
434434
{
435435
DECLARE_SOA_INDEX_COLUMN(FDExtMCParticle, fdExtMCParticle); //! MC particle for femtodreamparticle

‎PWGCF/FemtoDream/Core/femtoDreamPairCleaner.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class FemtoDreamPairCleaner
7070
}
7171
const auto& posChild = particles.iteratorAt(part2.index() - 2);
7272
const auto& negChild = particles.iteratorAt(part2.index() - 1);
73-
if (part1.globalIndex() != posChild.childrenIds()[0] && part1.globalIndex() != negChild.childrenIds()[1]) {
73+
if (part1.index() != posChild.childrenIds()[0] && part1.index() != negChild.childrenIds()[1]) {
7474
return true;
7575
}
7676
return false;

‎PWGCF/FemtoDream/TableProducer/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,9 @@ o2physics_add_dpl_workflow(femtodream-producer-reduced
1818
SOURCES femtoDreamProducerReducedTask.cxx
1919
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
2020
COMPONENT_NAME Analysis)
21+
22+
o2physics_add_dpl_workflow(femtodream-producer-for-specific-analysis
23+
SOURCES femtoDreamProducerTaskForSpecificAnalysis.cxx
24+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
25+
COMPONENT_NAME Analysis)
26+

0 commit comments

Comments
 (0)