Skip to content

PWGJE: Adding tasks for luminosity calculation in the JE framework #7437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nzardosh merged 4 commits into from
Aug 27, 2024
Merged

PWGJE: Adding tasks for luminosity calculation in the JE framework #7437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38f9a0e
PWGJE: Adding tasks for luminosity calculation in the JE framework
nzardosh Aug 26, 2024
87ea838
fixing which element is needed
nzardosh Aug 26, 2024
80db488
fixing zvertex position check
nzardosh Aug 26, 2024
1d4aa36
adding vtxz to histogram labels
nzardosh Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 36 additions & 12 deletions PWGJE/DataModel/JetReducedData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ DECLARE_SOA_BITMAP_COLUMN(Alias, alias, 32);
DECLARE_SOA_BITMAP_COLUMN(Selection, selection, 64);
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndNoTFB, readCountsWithTVXAndNoTFB, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndNoTFBAndNoITSROFB, readCountsWithTVXAndNoTFBAndNoITSROFB, std::vector<int>);
} // namespace jbc

DECLARE_SOA_TABLE(JBCs, "AOD", "JBC",
Expand Down Expand Up @@ -70,12 +71,14 @@ DECLARE_SOA_TABLE(StoredJBCPIs, "AOD1", "JBCPI",
DECLARE_SOA_TABLE(BCCounts, "AOD", "BCCOUNT",
jbc::ReadCounts,
jbc::ReadCountsWithTVX,
jbc::ReadCountsWithTVXAndITSROFBAndNoTFB);
jbc::ReadCountsWithTVXAndNoTFB,
jbc::ReadCountsWithTVXAndNoTFBAndNoITSROFB);

DECLARE_SOA_TABLE(StoredBCCounts, "AOD1", "BCCOUNT",
jbc::ReadCounts,
jbc::ReadCountsWithTVX,
jbc::ReadCountsWithTVXAndITSROFBAndNoTFB,
jbc::ReadCountsWithTVXAndNoTFB,
jbc::ReadCountsWithTVXAndNoTFBAndNoITSROFB,
o2::soa::Marker<1>);

namespace jcollision
Expand All @@ -96,9 +99,16 @@ DECLARE_SOA_COLUMN(FullTriggerSel, fullTriggerSel, uint32_t);
DECLARE_SOA_COLUMN(ChargedHFTriggerSel, chargedHFTriggerSel, uint8_t);
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8, readCountsWithTVXAndZVertexAndSel8, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8Full, readCountsWithTVXAndZVertexAndSel8Full, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8FullPbPb, readCountsWithTVXAndZVertexAndSel8FullPbPb, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelMC, readCountsWithTVXAndZVertexAndSelMC, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelMCFull, readCountsWithTVXAndZVertexAndSelMCFull, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelMCFullPbPb, readCountsWithTVXAndZVertexAndSelMCFullPbPb, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelUnanchoredMC, readCountsWithTVXAndZVertexAndSelUnanchoredMC, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelTVX, readCountsWithTVXAndZVertexAndSelTVX, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel7, readCountsWithTVXAndZVertexAndSel7, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel7KINT7, readCountsWithTVXAndZVertexAndSel7KINT7, std::vector<int>);
DECLARE_SOA_COLUMN(IsAmbiguous, isAmbiguous, bool);
DECLARE_SOA_COLUMN(IsEMCALReadout, isEmcalReadout, bool);
} // namespace jcollision
Expand Down Expand Up @@ -169,16 +179,30 @@ DECLARE_SOA_TABLE(JChHFTrigSels, "AOD", "JCHHFTRIGSEL",
DECLARE_SOA_TABLE(CollisionCounts, "AOD", "COLLCOUNT",
jcollision::ReadCounts,
jcollision::ReadCountsWithTVX,
jcollision::ReadCountsWithTVXAndSelection,
jcollision::ReadCountsWithTVXAndSelectionAndZVertex,
jcollision::WrittenCounts);
jcollision::ReadCountsWithTVXAndZVertexAndSel8,
jcollision::ReadCountsWithTVXAndZVertexAndSel8Full,
jcollision::ReadCountsWithTVXAndZVertexAndSel8FullPbPb,
jcollision::ReadCountsWithTVXAndZVertexAndSelMC,
jcollision::ReadCountsWithTVXAndZVertexAndSelMCFull,
jcollision::ReadCountsWithTVXAndZVertexAndSelMCFullPbPb,
jcollision::ReadCountsWithTVXAndZVertexAndSelUnanchoredMC,
jcollision::ReadCountsWithTVXAndZVertexAndSelTVX,
jcollision::ReadCountsWithTVXAndZVertexAndSel7,
jcollision::ReadCountsWithTVXAndZVertexAndSel7KINT7);

DECLARE_SOA_TABLE(StoredCollisionCounts, "AOD1", "COLLCOUNT",
jcollision::ReadCounts,
jcollision::ReadCountsWithTVX,
jcollision::ReadCountsWithTVXAndSelection,
jcollision::ReadCountsWithTVXAndSelectionAndZVertex,
jcollision::WrittenCounts,
jcollision::ReadCountsWithTVXAndZVertexAndSel8,
jcollision::ReadCountsWithTVXAndZVertexAndSel8Full,
jcollision::ReadCountsWithTVXAndZVertexAndSel8FullPbPb,
jcollision::ReadCountsWithTVXAndZVertexAndSelMC,
jcollision::ReadCountsWithTVXAndZVertexAndSelMCFull,
jcollision::ReadCountsWithTVXAndZVertexAndSelMCFullPbPb,
jcollision::ReadCountsWithTVXAndZVertexAndSelUnanchoredMC,
jcollision::ReadCountsWithTVXAndZVertexAndSelTVX,
jcollision::ReadCountsWithTVXAndZVertexAndSel7,
jcollision::ReadCountsWithTVXAndZVertexAndSel7KINT7,
o2::soa::Marker<1>);

namespace jmccollision
Expand Down
28 changes: 0 additions & 28 deletions PWGJE/DataModel/JetReducedDataDQ.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,6 @@ DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
DECLARE_SOA_INDEX_COLUMN(JMcParticle, mcParticle);
} // namespace jdielectronindices

namespace dielectronbccounter
{
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
} // namespace dielectronbccounter

namespace dielectroncollisioncounter
{
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
} // namespace dielectroncollisioncounter

DECLARE_SOA_TABLE(JDielectronCollisionIds, "AOD", "JDIELCOLLID",
jdielectronindices::JCollisionId);

Expand All @@ -93,18 +77,6 @@ DECLARE_SOA_TABLE(StoredJDielectronIds, "AOD1", "JDIELID",
jdielectronindices::Prong1Id,
o2::soa::Marker<1>);

DECLARE_SOA_TABLE(DielectronBCCounts, "AOD", "DIELBCCOUNT",
dielectronbccounter::ReadCounts,
dielectronbccounter::ReadCountsWithTVX,
dielectronbccounter::ReadCountsWithTVXAndITSROFBAndNoTFB);

DECLARE_SOA_TABLE(DielectronCollisionCounts, "AOD", "DIELCOLLCOUNT",
dielectroncollisioncounter::ReadCounts,
dielectroncollisioncounter::ReadCountsWithTVX,
dielectroncollisioncounter::ReadCountsWithTVXAndSelection,
dielectroncollisioncounter::ReadCountsWithTVXAndSelectionAndZVertex,
dielectroncollisioncounter::WrittenCounts);

namespace jdielectronmc
{
DECLARE_SOA_COLUMN(Pt, pt, float);
Expand Down
56 changes: 0 additions & 56 deletions PWGJE/DataModel/JetReducedDataHF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,6 @@ DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
DECLARE_SOA_INDEX_COLUMN(JMcParticle, mcParticle);
} // namespace jd0indices

namespace d0bccounter
{
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
} // namespace d0bccounter

namespace d0collisioncounter
{
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
} // namespace d0collisioncounter

DECLARE_SOA_TABLE(JD0CollisionIds, "AOD", "JD0COLLID",
jd0indices::JCollisionId);

Expand Down Expand Up @@ -85,18 +69,6 @@ DECLARE_SOA_TABLE(StoredJD0PIds, "AOD1", "JD0PID",
jd0indices::JMcParticleId,
o2::soa::Marker<1>);

DECLARE_SOA_TABLE(D0BCCounts, "AOD", "D0BCCOUNT",
d0bccounter::ReadCounts,
d0bccounter::ReadCountsWithTVX,
d0bccounter::ReadCountsWithTVXAndITSROFBAndNoTFB);

DECLARE_SOA_TABLE(D0CollisionCounts, "AOD", "D0COLLCOUNT",
d0collisioncounter::ReadCounts,
d0collisioncounter::ReadCountsWithTVX,
d0collisioncounter::ReadCountsWithTVXAndSelection,
d0collisioncounter::ReadCountsWithTVXAndSelectionAndZVertex,
d0collisioncounter::WrittenCounts);

namespace jlcindices
{
DECLARE_SOA_INDEX_COLUMN(JCollision, collision);
Expand All @@ -107,22 +79,6 @@ DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
DECLARE_SOA_INDEX_COLUMN(JMcParticle, mcParticle);
} // namespace jlcindices

namespace lcbccounter
{
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
} // namespace lcbccounter

namespace lccollisioncounter
{
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
} // namespace lccollisioncounter

DECLARE_SOA_TABLE(JLcCollisionIds, "AOD", "JLCCOLLID",
jlcindices::JCollisionId);

Expand Down Expand Up @@ -159,18 +115,6 @@ DECLARE_SOA_TABLE(StoredJLcPIds, "AOD1", "JLCPID",
jlcindices::JMcParticleId,
o2::soa::Marker<1>);

DECLARE_SOA_TABLE(LcBCCounts, "AOD", "LCBCCOUNT",
lcbccounter::ReadCounts,
lcbccounter::ReadCountsWithTVX,
lcbccounter::ReadCountsWithTVXAndITSROFBAndNoTFB);

DECLARE_SOA_TABLE(LcCollisionCounts, "AOD", "LCCOLLCOUNT",
lccollisioncounter::ReadCounts,
lccollisioncounter::ReadCountsWithTVX,
lccollisioncounter::ReadCountsWithTVXAndSelection,
lccollisioncounter::ReadCountsWithTVXAndSelectionAndZVertex,
lccollisioncounter::WrittenCounts);

} // namespace o2::aod

#endif // PWGJE_DATAMODEL_JETREDUCEDDATAHF_H_
28 changes: 0 additions & 28 deletions PWGJE/DataModel/JetReducedDataV0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,6 @@ DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
DECLARE_SOA_INDEX_COLUMN(JMcParticle, mcParticle);
} // namespace jv0indices

namespace v0bccounter
{
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
} // namespace v0bccounter

namespace v0collisioncounter
{
DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
} // namespace v0collisioncounter

DECLARE_SOA_TABLE(JV0CollisionIds, "AOD", "JV0COLLID",
jv0indices::JCollisionId);

Expand All @@ -87,18 +71,6 @@ DECLARE_SOA_TABLE(JV0Ids, "AOD", "JV0ID",
jv0indices::PosTrackId,
jv0indices::NegTrackId);

DECLARE_SOA_TABLE(V0BCCounts, "AOD", "V0BCCOUNT",
v0bccounter::ReadCounts,
v0bccounter::ReadCountsWithTVX,
v0bccounter::ReadCountsWithTVXAndITSROFBAndNoTFB);

DECLARE_SOA_TABLE(V0CollisionCounts, "AOD", "V0COLLCOUNT",
v0collisioncounter::ReadCounts,
v0collisioncounter::ReadCountsWithTVX,
v0collisioncounter::ReadCountsWithTVXAndSelection,
v0collisioncounter::ReadCountsWithTVXAndSelectionAndZVertex,
v0collisioncounter::WrittenCounts);

namespace jv0mc
{
DECLARE_SOA_COLUMN(Pt, pt, float);
Expand Down
10 changes: 10 additions & 0 deletions PWGJE/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ o2physics_add_dpl_workflow(jet-deriveddata-writer
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(jet-luminosity-producer
SOURCES luminosityproducer.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(jet-luminosity-calculator
SOURCES luminositycalculator.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(jet-matching-mc
SOURCES jetmatchingmc.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
Expand Down
Loading