Skip to content

[PWGCF] Fix naming and other bugs in producer task for Pb-Pb collisions #11844

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
lauraser merged 3 commits into from
Jun 30, 2025
Merged

[PWGCF] Fix naming and other bugs in producer task for Pb-Pb collisions #11844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ea04d3
[PWGCF] Fix naming and other bugs in producer task for Pb-Pb collisions
ZeptoStarling Jun 30, 2025
459168a
Please consider the following formatting changes
alibuild Jun 30, 2025
8ebd3f7
Merge pull request #1 from alibuild/alibot-cleanup-11844
ZeptoStarling Jun 30, 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
2 changes: 1 addition & 1 deletion PWGCF/FemtoDream/Tasks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,52 +9,52 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

o2physics_add_dpl_workflow(femtodream-pair-track-track

Check failure on line 12 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name femtodream-pair-track-track does not match its file name femtoDreamPairTaskTrackTrack.cxx. (Matches femtodreamPairTrackTrack.cxx.)
SOURCES femtoDreamPairTaskTrackTrack.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-triplet-track-track-track

Check failure on line 17 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name femtodream-triplet-track-track-track does not match its file name femtoDreamTripletTaskTrackTrackTrack.cxx. (Matches femtodreamTripletTrackTrackTrack.cxx.)
SOURCES femtoDreamTripletTaskTrackTrackTrack.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-triplet-track-track-track-pbpb
o2physics_add_dpl_workflow(femtodream-triplet-track-track-track-pb-pb

Check failure on line 22 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name femtodream-triplet-track-track-track-pb-pb does not match its file name femtoDreamTripletTaskTrackTrackTrackPbPb.cxx. (Matches femtodreamTripletTrackTrackTrackPbPb.cxx.)
SOURCES femtoDreamTripletTaskTrackTrackTrackPbPb.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-pair-track-v0

Check failure on line 27 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name femtodream-pair-track-v0 does not match its file name femtoDreamPairTaskTrackV0.cxx. (Matches femtodreamPairTrackV0.cxx.)
SOURCES femtoDreamPairTaskTrackV0.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-pair-track-cascade

Check failure on line 32 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name femtodream-pair-track-cascade does not match its file name femtoDreamPairTaskTrackCascade.cxx. (Matches femtodreamPairTrackCascade.cxx.)
SOURCES femtoDreamPairTaskTrackCascade.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-triplet-track-track-v0

Check failure on line 37 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name femtodream-triplet-track-track-v0 does not match its file name femtoDreamTripletTaskTrackTrackV0.cxx. (Matches femtodreamTripletTrackTrackV0.cxx.)
SOURCES femtoDreamTripletTaskTrackTrackV0.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-debug-track

Check failure on line 42 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name femtodream-debug-track does not match its file name femtoDreamDebugTrack.cxx. (Matches femtodreamDebugTrack.cxx.)
SOURCES femtoDreamDebugTrack.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-debug-v0

Check failure on line 47 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name femtodream-debug-v0 does not match its file name femtoDreamDebugV0.cxx. (Matches femtodreamDebugV0.cxx.)
SOURCES femtoDreamDebugV0.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-debug-cascade

Check failure on line 52 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name femtodream-debug-cascade does not match its file name femtoDreamDebugCascade.cxx. (Matches femtodreamDebugCascade.cxx.)
SOURCES femtoDreamDebugCascade.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(femtodream-collision-masker

Check failure on line 57 in PWGCF/FemtoDream/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name femtodream-collision-masker does not match its file name femtoDreamCollisionMasker.cxx. (Matches femtodreamCollisionMasker.cxx.)
SOURCES femtoDreamCollisionMasker.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/FemtoDream/Tasks/femtoDreamCollisionMasker.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ struct femoDreamCollisionMasker {
NegChildPIDTPCBits.at(CollisionMasks::kPartTwo).push_back(option.defaultValue.get<femtodreamparticle::cutContainerType>());
}
}
} else if (device.name.find("femto-dream-triplet-task-track-track-track") != std::string::npos) {
} else if ((device.name.find("femto-dream-triplet-task-track-track-track") != std::string::npos) || (device.name.find("femto-dream-triplet-task-track-track-track-pb-pb") != std::string::npos)) {
LOG(info) << "Matched workflow: " << device.name;
TaskFinder = CollisionMasks::kTrackTrackTrack;
for (auto const& option : device.options) {
Expand Down
32 changes: 17 additions & 15 deletions PWGCF/FemtoDream/Tasks/femtoDreamTripletTaskTrackTrackTrackPbPb.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

/// \file femtoDreamTripletTaskTrackTrackTrack.cxx
/// \file femtoDreamTripletTaskTrackTrackTrackPbPb.cxx
/// \brief Tasks that reads the track tables and creates track triplets; only three identical particles can be used
/// \author Laura Serksnyte, TU München, laura.serksnyte@tum.de

Expand Down Expand Up @@ -40,7 +40,7 @@ using namespace o2::framework;
using namespace o2::framework::expressions;
using namespace o2::soa;

struct femtoDreamTripletTaskTrackTrackTrack {
struct femtoDreamTripletTaskTrackTrackTrackPbPb {
SliceCache cache;
Preslice<aod::FDParticles> perCol = aod::femtodreamparticle::fdCollisionId;

Expand All @@ -51,7 +51,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
using FilteredFDCollisions = soa::Filtered<aod::FDCollisions>;
using FilteredFDCollision = FilteredFDCollisions::iterator;

using MaskedCollisions = soa::Join<FilteredFDCollisions, aod::FDColMasks>;
using MaskedCollisions = soa::Filtered<soa::Join<aod::FDCollisions, aod::FDColMasks>>;
using MaskedCollision = MaskedCollisions::iterator;
aod::femtodreamcollision::BitMaskType MaskBit = -1;
float mMassOne = -999, mMassTwo = -999, mMassThree = -999;
Expand Down Expand Up @@ -163,7 +163,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
ThreeBodyQARegistry.add("TrackMC_QA/hMazzachi", ";gen;(reco-gen)/gen", kTH2F, {{100, ConfMinpT, ConfMaxpT}, {300, -1, 1}});
}
ThreeBodyQARegistry.add("TripletTaskQA/hCentrality", ";Centrality; Q3", kTH2F, {{100, 0, 100}, ConfQ3Bins});
ThreeBodyQARegistry.add("TripletTaskQA/hCentralityME", ";Centrality;", kTH1F, {{100, 0.0, 100.0}});
ThreeBodyQARegistry.add("TripletTaskQA/hCentralityME", ";Centrality;Entries", kTH1F, {{100, 0.0, 100.0}});

sameEventCont.init(&resultRegistry, ConfQ3Bins, ConfMultBins, ConfIsMC);
mixedEventCont.init(&resultRegistry, ConfQ3Bins, ConfMultBins, ConfIsMC);
Expand All @@ -185,7 +185,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
int index = 0;
auto& workflows = context.services().get<RunningWorkflowInfo const>();
for (DeviceSpec const& device : workflows.devices) {
if (device.name.find("femto-dream-triplet-task-track-track-track") != std::string::npos) {
if (device.name.find("femto-dream-triplet-task-track-track-track-pb-pb") != std::string::npos) {
if (containsNameValuePair(device.options, "ConfCutPart", ConfCutPart.value) &&
containsNameValuePair(device.options, "ConfTPCPIDBit", ConfTPCPIDBit.value) &&
containsNameValuePair(device.options, "ConfTPCTOFPIDBit", ConfTPCTOFPIDBit.value) &&
Expand Down Expand Up @@ -295,7 +295,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
}
doSameEvent<false>(thegroupSelectedParts, parts, col.magField(), col.multNtr(), col.multV0M());
}
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrack, processSameEvent, "Enable processing same event", true);
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrackPbPb, processSameEvent, "Enable processing same event", true);

/// process function to call doSameEvent with Data which has a mask for containing particles or not
/// \param col subscribe to the collision table (Data)
Expand All @@ -312,7 +312,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
}
doSameEvent<false>(thegroupSelectedParts, parts, col.magField(), col.multNtr(), col.multV0M());
}
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrack, processSameEventMasked, "Enable processing same event with masks", false);
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrackPbPb, processSameEventMasked, "Enable processing same event with masks", false);

/// process function for to call doSameEvent with Monte Carlo
/// \param col subscribe to the collision table (Monte Carlo Reconstructed reconstructed)
Expand All @@ -333,7 +333,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
}
doSameEvent<true>(thegroupSelectedParts, parts, col.magField(), col.multNtr(), col.multV0M());
}
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrack, processSameEventMC, "Enable processing same event for Monte Carlo", false);
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrackPbPb, processSameEventMC, "Enable processing same event for Monte Carlo", false);

/// process function for to call doSameEvent with Monte Carlo which has a mask for containing particles or not
/// \param col subscribe to the collision table (Monte Carlo Reconstructed reconstructed)
Expand All @@ -354,7 +354,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
}
doSameEvent<true>(thegroupSelectedParts, parts, col.magField(), col.multNtr(), col.multV0M());
}
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrack, processSameEventMCMasked, "Enable processing same event for Monte Carlo", false);
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrackPbPb, processSameEventMCMasked, "Enable processing same event for Monte Carlo", false);

/// This function processes the mixed event
/// \tparam PartitionType
Expand Down Expand Up @@ -417,7 +417,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
doMixedEvent<false>(groupPartsOne, groupPartsTwo, groupPartsThree, parts, magFieldTesla1, multiplicityCol);
}
}
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrack, processMixedEvent, "Enable processing mixed events", true);
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrackPbPb, processMixedEvent, "Enable processing mixed events", true);

/// process function for to call doMixedEvent with Data which has a mask for containing particles or not
/// @param cols subscribe to the collisions table (Data)
Expand All @@ -429,10 +429,12 @@ struct femtoDreamTripletTaskTrackTrackTrack {
(ConfTracksInMixedEvent == 3 && (aod::femtodreamcollision::bitmaskTrackThree & MaskBit) == MaskBit);

PartitionMaskedCol1.bindTable(cols);

for (auto& [collision1, collision2, collision3] : soa::selfCombinations(colBinning, ConfNEventsMix, -1, *PartitionMaskedCol1.mFiltered, *PartitionMaskedCol1.mFiltered, *PartitionMaskedCol1.mFiltered)) {
const int multiplicityCol = collision1.multNtr();
ThreeBodyQARegistry.fill(HIST("TripletTaskQA/hMECollisionBins"), colBinning.getBin({collision1.posZ(), multiplicityCol}));
ThreeBodyQARegistry.fill(HIST("TripletTaskQA/hCentralityME"), collision1.multV0M());
ThreeBodyQARegistry.fill(HIST("TripletTaskQA/hCentralityME"), collision2.multV0M());
ThreeBodyQARegistry.fill(HIST("TripletTaskQA/hCentralityME"), collision3.multV0M());

auto groupPartsOne = SelectedParts->sliceByCached(aod::femtodreamparticle::fdCollisionId, collision1.globalIndex(), cache);
auto groupPartsTwo = SelectedParts->sliceByCached(aod::femtodreamparticle::fdCollisionId, collision2.globalIndex(), cache);
Expand All @@ -449,7 +451,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
doMixedEvent<false>(groupPartsOne, groupPartsTwo, groupPartsThree, parts, magFieldTesla1, multiplicityCol);
}
}
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrack, processMixedEventMasked, "Enable processing mixed events", false);
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrackPbPb, processMixedEventMasked, "Enable processing mixed events", false);

/// brief process function for to call doMixedEvent with Monte Carlo
/// @param cols subscribe to the collisions table (Monte Carlo Reconstructed reconstructed)
Expand Down Expand Up @@ -480,7 +482,7 @@ struct femtoDreamTripletTaskTrackTrackTrack {
doMixedEvent<true>(groupPartsOne, groupPartsTwo, groupPartsThree, parts, magFieldTesla1, multiplicityCol);
}
}
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrack, processMixedEventMC, "Enable processing mixed events MC", false);
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrackPbPb, processMixedEventMC, "Enable processing mixed events MC", false);

/// brief process function for to call doMixedEvent with Monte Carlo which has a mask for containing particles or not
/// @param cols subscribe to the collisions table (Monte Carlo Reconstructed reconstructed)
Expand Down Expand Up @@ -516,13 +518,13 @@ struct femtoDreamTripletTaskTrackTrackTrack {
doMixedEvent<true>(groupPartsOne, groupPartsTwo, groupPartsThree, parts, magFieldTesla1, multiplicityCol);
}
}
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrack, processMixedEventMCMasked, "Enable processing mixed events MC", false);
PROCESS_SWITCH(femtoDreamTripletTaskTrackTrackTrackPbPb, processMixedEventMCMasked, "Enable processing mixed events MC", false);
};

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
WorkflowSpec workflow{
adaptAnalysisTask<femtoDreamTripletTaskTrackTrackTrack>(cfgc),
adaptAnalysisTask<femtoDreamTripletTaskTrackTrackTrackPbPb>(cfgc),
};
return workflow;
}
Loading