Skip to content

[PWGJE] eventWeight fix for fake collisions #10956

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
aimeric-landou wants to merge 4 commits into from
Closed

[PWGJE] eventWeight fix for fake collisions #10956

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
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
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 @@ -8,7 +8,7 @@
// In applying this license CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

Check warning on line 11 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \file is missing, incorrect or misplaced.
// task to produce a self contained data format for jet analyses from the full AO2D
//
/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
Expand All @@ -24,7 +24,7 @@
#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoA.h"
#include "Framework/O2DatabasePDGPlugin.h"
#include "TDatabasePDG.h"

Check warning on line 27 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database] 

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.

#include "CCDB/BasicCCDBManager.h"
#include "DataFormatsParameters/GRPMagField.h"
Expand Down Expand Up @@ -241,12 +241,11 @@

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 Expand Up @@ -379,14 +378,14 @@
std::vector<int32_t> mothersId;
if (particle.has_mothers()) {
auto mothersIdTemps = particle.mothersIds();
for (auto mothersIdTemp : mothersIdTemps) {

Check warning on line 381 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
mothersId.push_back(mothersIdTemp);
}
}
int daughtersId[2] = {-1, -1};
auto i = 0;
if (particle.has_daughters()) {
for (auto daughterId : particle.daughtersIds()) {

Check warning on line 388 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (i > 1) {
break;
}
Expand All @@ -402,7 +401,7 @@
void processClusters(aod::Collision const&, aod::EMCALClusters const& clusters, aod::EMCALClusterCells const& cells, aod::Calos const&, aod::EMCALMatchedTracks const& matchedTracks, soa::Join<aod::Tracks, aod::TracksExtra> const&)
{

for (auto cluster : clusters) {

Check warning on line 404 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.

auto const clusterCells = cells.sliceBy(perClusterCells, cluster.globalIndex());

Expand Down Expand Up @@ -444,7 +443,7 @@
void processMcClusterLabels(aod::EMCALMCCluster const& cluster)
{
std::vector<int32_t> particleIds;
for (auto particleId : cluster.mcParticleIds()) {

Check warning on line 446 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
particleIds.push_back(particleId);
}
std::vector<float> amplitudeA;
Expand Down Expand Up @@ -605,14 +604,14 @@
std::vector<int32_t> mothersId;
if (particle.has_mothers()) {
auto mothersIdTemps = particle.mothersIds();
for (auto mothersIdTemp : mothersIdTemps) {

Check warning on line 607 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
mothersId.push_back(mothersIdTemp);
}
}
int daughtersId[2] = {-1, -1};
auto i = 0;
if (particle.has_daughters()) {
for (auto daughterId : particle.daughtersIds()) {

Check warning on line 614 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (i > 1) {
break;
}
Expand Down Expand Up @@ -659,14 +658,14 @@
std::vector<int32_t> mothersId;
if (particle.has_mothers()) {
auto mothersIdTemps = particle.mothersIds();
for (auto mothersIdTemp : mothersIdTemps) {

Check warning on line 661 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
mothersId.push_back(mothersIdTemp);
}
}
int daughtersId[2] = {-1, -1};
auto i = 0;
if (particle.has_daughters()) {
for (auto daughterId : particle.daughtersIds()) {

Check warning on line 668 in PWGJE/TableProducer/derivedDataProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (i > 1) {
break;
}
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