Skip to content

Please consider the following formatting changes to #10956 #13

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 5 commits into from
Closed

Please consider the following formatting changes to #10956 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfe1578
[PWGJE] eventWeight fix for fake collisions
aimeric-landou Apr 23, 2025
b647a7b
deriveddataproducer weight fix forgotten
aimeric-landou Apr 23, 2025
c6e56d9
use jCollisionMcInfosTable instead of intermediary mcCollision
aimeric-landou Apr 23, 2025
d2e8cc9
jetSpectraCharged fakeCollision QC
aimeric-landou Apr 23, 2025
48b577b
Please consider the following formatting changes
alibuild Apr 23, 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
5 changes: 2 additions & 3 deletions PWGJE/TableProducer/derivedDataProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,11 @@ struct JetDerivedDataProducerTask {

void processMcCollisionLabels(soa::Join<aod::Collisions, aod::McCollisionLabels>::iterator const& collision, aod::McCollisions const&)
{
products.jMcCollisionsLabelTable(collision.mcCollisionId()); // collision.mcCollisionId() returns -1 if collision has no associated mcCollision
if (collision.has_mcCollision()) {
products.jMcCollisionsLabelTable(collision.mcCollisionId());
products.jCollisionMcInfosTable(collision.mcCollision().weight(), collision.mcCollision().getSubGeneratorId());
} else {
products.jMcCollisionsLabelTable(-1);
products.jCollisionMcInfosTable(-1.0, jetderiveddatautilities::JCollisionSubGeneratorId::none);
products.jCollisionMcInfosTable(0.0, jetderiveddatautilities::JCollisionSubGeneratorId::none);
}
}
PROCESS_SWITCH(JetDerivedDataProducerTask, processMcCollisionLabels, "produces derived MC collision labels table", false);
Expand Down
4 changes: 2 additions & 2 deletions PWGJE/TableProducer/jetEventWeightMCD.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ struct JetEventWeightMCDTask {
void processMCDetectorLevelEventWeight(MCDetectorLevelJetTable const& jet, soa::Join<aod::JetCollisions, aod::JMcCollisionLbs> const&, aod::JetMcCollisions const&)
{
auto collision = jet.template collision_as<soa::Join<aod::JetCollisions, aod::JMcCollisionLbs>>();
mcDetectorLevelWeightsTable(jet.globalIndex(), collision.mcCollision().weight());
mcDetectorLevelWeightsTable(jet.globalIndex(), collision.weight());
}
PROCESS_SWITCH(JetEventWeightMCDTask, processMCDetectorLevelEventWeight, "Fill event weight tables for detector level MC jets", false);

void processMCDetectorLevelEventWiseSubtractedEventWeight(MCDetectorLevelEventWiseSubtractedJetTable const& jet, soa::Join<aod::JetCollisions, aod::JMcCollisionLbs> const&, aod::JetMcCollisions const&)
{
auto collision = jet.template collision_as<soa::Join<aod::JetCollisions, aod::JMcCollisionLbs>>();
mcDetectorLevelEventWiseSubtractedWeightsTable(jet.globalIndex(), collision.mcCollision().weight());
mcDetectorLevelEventWiseSubtractedWeightsTable(jet.globalIndex(), collision.weight());
}
PROCESS_SWITCH(JetEventWeightMCDTask, processMCDetectorLevelEventWiseSubtractedEventWeight, "Fill event weight tables for detector level MC jets", false);
};
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/Tasks/jetFinderQA.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ struct JetFinderQATask {
aod::JetMcCollisions const&,
soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras>> const& tracks)
{
float eventWeight = collision.mcCollision().weight();
float eventWeight = collision.weight();
if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) {
return;
}
Expand Down
13 changes: 6 additions & 7 deletions PWGJE/Tasks/jetSpectraCharged.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,10 +531,7 @@ struct JetSpectraCharged {
aod::JetMcCollisions const&,
soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras>> const& tracks)
{
if (!collision.has_mcCollision()) { // the collision is fake and has no associated mc coll; skip as .mccollision() cannot be called
return;
}
float eventWeight = collision.mcCollision().weight();
float eventWeight = collision.weight();
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
return;
}
Expand All @@ -552,6 +549,9 @@ struct JetSpectraCharged {

void processCollisions(soa::Filtered<aod::JetCollisions>::iterator const& collision)
{
if (!collision.has_mcCollision()) {
registry.fill(HIST("h_fakecollisions"), 0.5);
}
registry.fill(HIST("h_collisions"), 0.5);
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
return;
Expand All @@ -569,11 +569,10 @@ struct JetSpectraCharged {
void processCollisionsWeighted(soa::Join<aod::JetCollisions, aod::JMcCollisionLbs>::iterator const& collision,
aod::JetMcCollisions const&)
{
if (!collision.has_mcCollision()) { // the collision is fake and has no associated mc coll; skip as .mccollision() cannot be called
if (!collision.has_mcCollision()) {
registry.fill(HIST("h_fakecollisions"), 0.5);
return;
}
float eventWeight = collision.mcCollision().weight();
float eventWeight = collision.weight();
registry.fill(HIST("h_collisions"), 0.5);
registry.fill(HIST("h_collisions_weighted"), 0.5, eventWeight);
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
Expand Down
Loading