Skip to content

Commit 9526303

Browse files
[PWGJE] eventWeight fix for fake collisions (AliceO2Group#10959)
1 parent 4841e98 commit 9526303

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

PWGJE/TableProducer/derivedDataProducer.cxx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,11 @@ struct JetDerivedDataProducerTask {
241241

242242
void processMcCollisionLabels(soa::Join<aod::Collisions, aod::McCollisionLabels>::iterator const& collision, aod::McCollisions const&)
243243
{
244+
products.jMcCollisionsLabelTable(collision.mcCollisionId()); // collision.mcCollisionId() returns -1 if collision has no associated mcCollision
244245
if (collision.has_mcCollision()) {
245-
products.jMcCollisionsLabelTable(collision.mcCollisionId());
246246
products.jCollisionMcInfosTable(collision.mcCollision().weight(), collision.mcCollision().getSubGeneratorId());
247247
} else {
248-
products.jMcCollisionsLabelTable(-1);
249-
products.jCollisionMcInfosTable(-1.0, jetderiveddatautilities::JCollisionSubGeneratorId::none);
248+
products.jCollisionMcInfosTable(0.0, jetderiveddatautilities::JCollisionSubGeneratorId::none);
250249
}
251250
}
252251
PROCESS_SWITCH(JetDerivedDataProducerTask, processMcCollisionLabels, "produces derived MC collision labels table", false);

PWGJE/TableProducer/jetEventWeightMCD.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ struct JetEventWeightMCDTask {
4040
void processMCDetectorLevelEventWeight(MCDetectorLevelJetTable const& jet, soa::Join<aod::JetCollisions, aod::JMcCollisionLbs> const&, aod::JetMcCollisions const&)
4141
{
4242
auto collision = jet.template collision_as<soa::Join<aod::JetCollisions, aod::JMcCollisionLbs>>();
43-
mcDetectorLevelWeightsTable(jet.globalIndex(), collision.mcCollision().weight());
43+
mcDetectorLevelWeightsTable(jet.globalIndex(), collision.weight());
4444
}
4545
PROCESS_SWITCH(JetEventWeightMCDTask, processMCDetectorLevelEventWeight, "Fill event weight tables for detector level MC jets", false);
4646

4747
void processMCDetectorLevelEventWiseSubtractedEventWeight(MCDetectorLevelEventWiseSubtractedJetTable const& jet, soa::Join<aod::JetCollisions, aod::JMcCollisionLbs> const&, aod::JetMcCollisions const&)
4848
{
4949
auto collision = jet.template collision_as<soa::Join<aod::JetCollisions, aod::JMcCollisionLbs>>();
50-
mcDetectorLevelEventWiseSubtractedWeightsTable(jet.globalIndex(), collision.mcCollision().weight());
50+
mcDetectorLevelEventWiseSubtractedWeightsTable(jet.globalIndex(), collision.weight());
5151
}
5252
PROCESS_SWITCH(JetEventWeightMCDTask, processMCDetectorLevelEventWiseSubtractedEventWeight, "Fill event weight tables for detector level MC jets", false);
5353
};

PWGJE/Tasks/jetFinderQA.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ struct JetFinderQATask {
11911191
aod::JetMcCollisions const&,
11921192
soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras>> const& tracks)
11931193
{
1194-
float eventWeight = collision.mcCollision().weight();
1194+
float eventWeight = collision.weight();
11951195
if (skipMBGapEvents && collision.subGeneratorId() == jetderiveddatautilities::JCollisionSubGeneratorId::mbGap) {
11961196
return;
11971197
}

PWGJE/Tasks/jetSpectraCharged.cxx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -552,10 +552,7 @@ struct JetSpectraCharged {
552552
aod::JetMcCollisions const&,
553553
soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras>> const& tracks)
554554
{
555-
if (!collision.has_mcCollision()) { // the collision is fake and has no associated mc coll; skip as .mccollision() cannot be called
556-
return;
557-
}
558-
float eventWeight = collision.mcCollision().weight();
555+
float eventWeight = collision.weight();
559556
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
560557
return;
561558
}
@@ -590,11 +587,10 @@ struct JetSpectraCharged {
590587
void processCollisionsWeighted(soa::Join<aod::JetCollisions, aod::JMcCollisionLbs>::iterator const& collision,
591588
aod::JetMcCollisions const&)
592589
{
593-
if (!collision.has_mcCollision()) { // the collision is fake and has no associated mc coll; skip as .mccollision() cannot be called
590+
if (!collision.has_mcCollision()) {
594591
registry.fill(HIST("h_fakecollisions"), 0.5);
595-
return;
596592
}
597-
float eventWeight = collision.mcCollision().weight();
593+
float eventWeight = collision.weight();
598594
registry.fill(HIST("h_collisions"), 0.5);
599595
registry.fill(HIST("h_collisions_weighted"), 0.5, eventWeight);
600596
if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {

0 commit comments

Comments
 (0)