Skip to content

[PWGJE] Please consider the following formatting changes to #10211 #9

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

Closed
alibuild wants to merge 2 commits into from
Closed

[PWGJE] Please consider the following formatting changes to #10211 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4aef96
add cross section info for derived,reduced data
jaimenorman Feb 26, 2025
74337bf
Please consider the following formatting changes
alibuild Feb 26, 2025
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
10 changes: 9 additions & 1 deletion PWGJE/DataModel/JetReducedData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,22 @@ DECLARE_SOA_COLUMN(PosY, posY, float);
DECLARE_SOA_COLUMN(PosZ, posZ, float);
DECLARE_SOA_COLUMN(Weight, weight, float);
DECLARE_SOA_COLUMN(SubGeneratorId, subGeneratorId, int);
DECLARE_SOA_COLUMN(Accepted, accepted, uint64_t);
DECLARE_SOA_COLUMN(Attempted, attempted, uint64_t);
DECLARE_SOA_COLUMN(XsectGen, xsectGen, float);
DECLARE_SOA_COLUMN(XsectErr, xsectErr, float);
} // namespace jmccollision
DECLARE_SOA_TABLE_STAGED(JMcCollisions, "JMCCOLLISION",
o2::soa::Index<>,
jmccollision::PosX,
jmccollision::PosY,
jmccollision::PosZ,
jmccollision::Weight,
jmccollision::SubGeneratorId);
jmccollision::SubGeneratorId,
jmccollision::Accepted,
jmccollision::Attempted,
jmccollision::XsectGen,
jmccollision::XsectErr);

using JMcCollision = JMcCollisions::iterator;
using StoredJMcCollision = StoredJMcCollisions::iterator;
Expand Down
4 changes: 2 additions & 2 deletions PWGJE/TableProducer/derivedDataProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,9 @@ struct JetDerivedDataProducerTask {
}
PROCESS_SWITCH(JetDerivedDataProducerTask, processMcCollisionLabels, "produces derived MC collision labels table", false);

void processMcCollisions(aod::McCollision const& mcCollision)
void processMcCollisions(soa::Join<aod::McCollisions, aod::HepMCXSections>::iterator const& mcCollision)
{
products.jMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), mcCollision.weight(), mcCollision.getSubGeneratorId());
products.jMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), mcCollision.weight(), mcCollision.getSubGeneratorId(), mcCollision.accepted(), mcCollision.attempted(), mcCollision.xsectGen(), mcCollision.xsectErr());
products.jMcCollisionsParentIndexTable(mcCollision.globalIndex());
}
PROCESS_SWITCH(JetDerivedDataProducerTask, processMcCollisions, "produces derived MC collision table", false);
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/TableProducer/derivedDataWriter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ struct JetDerivedDataWriter {
for (auto const& mcCollision : mcCollisions) {
if (mcCollision.isMcCollisionSelected()) {

products.storedJMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), mcCollision.weight(), mcCollision.subGeneratorId());
products.storedJMcCollisionsTable(mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(), mcCollision.weight(), mcCollision.subGeneratorId(), mcCollision.accepted(), mcCollision.attempted(), mcCollision.xsectGen(), mcCollision.xsectErr());
products.storedJMcCollisionsParentIndexTable(mcCollision.mcCollisionId());
mcCollisionMapping[mcCollision.globalIndex()] = products.storedJMcCollisionsTable.lastIndex();
}
Expand Down
16 changes: 16 additions & 0 deletions PWGJE/Tasks/jetFinderQA.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,14 @@ struct JetFinderQATask {
if (doprocessMCCollisionsWeighted) {
AxisSpec weightAxis = {{VARIABLE_WIDTH, 1e-13, 1e-12, 1e-11, 1e-10, 1e-9, 1e-8, 1e-7, 1e-6, 1e-5, 1e-4, 1e-3, 1e-2, 1e-1, 1.0, 10.0}, "weights"};
registry.add("h_collision_eventweight_part", "event weight;event weight;entries", {HistType::kTH1F, {weightAxis}});
registry.add("h_accepted", "No. of Generated Events;No. of Generated Events;entries", {HistType::kTH1F, {{5000, 0., 5000.}}});
registry.add("h_attempted", "No. of Attempted Events;No. of Attempted Events;entries", {HistType::kTH1F, {{5000, 0., 5000.}}});
registry.add("h_xsecGen", "Cross section in pb; Cross section in pb; entries", {HistType::kTH1F, {{200000, 0., 2e11}}});
registry.add("h_xsecErr", "Error associated with the cross section", {HistType::kTH1F, {{200000, 0., 2e11}}});
registry.add("h_xsecGenSum", "Summed Cross section per collision in pb; Summed Cross section per collision in pb; entries", {HistType::kTH1F, {{1, 0., 1.}}});
registry.add("h_xsecGenSumWeighted", "Summed Cross section per collision in pb with weights; Summed Cross section per collision in pb with weights; entries", {HistType::kTH1F, {{1, 0., 1.}}});
registry.add("h_xsecErrSum", "Summed Cross section error per collision in pb; Summed Cross section error per collision in pb; entries", {HistType::kTH1F, {{1, 0., 1.}}});
registry.add("h_xsecErrSumWeighted", "Summed Cross section error per collision in pb with weights; Summed Cross section error per collision in pb with weights; entries", {HistType::kTH1F, {{1, 0., 1.}}});
}

AxisSpec occupancyAxis = {142, -1.5, 14000.5, "occupancy"};
Expand Down Expand Up @@ -949,6 +957,14 @@ struct JetFinderQATask {
return;
}
registry.fill(HIST("h_collision_eventweight_part"), collision.weight());
registry.fill(HIST("h_accepted"), collision.accepted());
registry.fill(HIST("h_attempted"), collision.attempted());
registry.fill(HIST("h_xsecGen"), collision.xsectGen());
registry.fill(HIST("h_xsecErr"), collision.xsectErr());
registry.fill(HIST("h_xsecGenSum"), 0.5, collision.xsectGen());
registry.fill(HIST("h_xsecGenSumWeighted"), 0.5, collision.xsectGen() * collision.weight());
registry.fill(HIST("h_xsecErrSum"), 0.5, collision.xsectErr());
registry.fill(HIST("h_xsecErrSumWeighted"), 0.5, collision.xsectErr() * collision.weight());
}
PROCESS_SWITCH(JetFinderQATask, processMCCollisionsWeighted, "collision QA for weighted events", false);

Expand Down
Loading