Skip to content

DPL Analysis: fix multiple HistogramRegistry instances per task #14742

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
ktf merged 1 commit into from
Oct 15, 2025
Merged

DPL Analysis: fix multiple HistogramRegistry instances per task #14742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions Framework/AnalysisSupport/src/AODWriterHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,9 @@ AlgorithmSpec AODWriterHelpers::getOutputObjHistWriter(ConfigContext const& ctx)
O2_SIGNPOST_END(histogram_registry, did, "deserialization", "Done deserialization.");
// If we have a folder, we assume the first element of the path
// to be the name of the registry.
bool folderForContainer = false;
if (sourceType == HistogramRegistrySource) {
folderForContainer = objh->createContainer != 0;
obj.container = objh->containerName;
} else {
obj.container = obj.name;
Expand Down Expand Up @@ -423,6 +425,16 @@ AlgorithmSpec AODWriterHelpers::getOutputObjHistWriter(ConfigContext const& ctx)
// FIXME: handle folders
f[route.policy]->cd("/");
auto* currentDir = f[route.policy]->GetDirectory(currentDirectory.c_str());

// In case we need a folder for the registry, let's create it.
if (folderForContainer) {
auto* histogramRegistryFolder = currentDir->GetDirectory(obj.container.data());
if (!histogramRegistryFolder) {
histogramRegistryFolder = currentDir->mkdir(obj.container.c_str(), "", kTRUE);
}
currentDir = histogramRegistryFolder;
}

// The name contains a path...
int objSize = 0;
if (sourceType == HistogramRegistrySource) {
Expand Down
5 changes: 4 additions & 1 deletion Framework/Core/include/Framework/OutputObjHeader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ enum OutputObjSourceType : unsigned int {
/// @brief O2 header for OutputObj metadata
struct OutputObjHeader : public BaseHeader {
constexpr static const uint32_t sVersion = 1;
constexpr static const uint32_t MAX_REGISTRY_NAME_SIZE = 128;
constexpr static const o2::header::HeaderType sHeaderType = "OutObjMD";
constexpr static const o2::header::SerializationMethod sSerializationMethod = o2::header::gSerializationMethodNone;
OutputObjHandlingPolicy mPolicy;
Expand All @@ -45,7 +46,9 @@ struct OutputObjHeader : public BaseHeader {
uint16_t mPipelineIndex = 0;
uint16_t mPipelineSize = 1;
// Name of the actual container for the object, e.g. the HistogramRegistry name
char containerName[64] = {0};
char containerName[MAX_REGISTRY_NAME_SIZE] = {0};
// Wether or not the container should have a name
char createContainer = false;

constexpr OutputObjHeader()
: BaseHeader(sizeof(OutputObjHeader), sHeaderType, sSerializationMethod, sVersion),
Expand Down
3 changes: 2 additions & 1 deletion Framework/Core/src/HistogramRegistry.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ OutputRef HistogramRegistry::ref(uint16_t pipelineIndex, uint16_t pipelineSize)
{
OutputObjHeader header{mPolicy, OutputObjSourceType::HistogramRegistrySource, mTaskHash, pipelineIndex, pipelineSize};
// Copy the name of the registry to the haeder.
strncpy(header.containerName, mName.data(), 64);
strncpy(header.containerName, mName.data(), OutputObjHeader::MAX_REGISTRY_NAME_SIZE);
header.createContainer = mCreateRegistryDir ? 1 : 0;
return OutputRef{std::string{mName}, 0, o2::header::Stack{header}};
}

Expand Down
12 changes: 12 additions & 0 deletions Framework/TestWorkflows/src/o2TestHistograms.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,18 @@ struct EtaAndClsHistogramsSimple {
} //
};

HistogramRegistry registry2{
"registry2",
{
{"a/foo/b/eta", "#Eta", {HistType::kTH1F, {{100, -2.0, 2.0}}}}, //
{"fii/c/hpt", "p_{T}", {HistType::kTH1D, {{1002, -0.01, 50.1}}}}, //
{"a/foobar/phi", "#Phi", {HistType::kTH1D, {{102, 0, 2 * M_PI}}}}, //
{"fifi/ptToPt", "#ptToPt", {HistType::kTH2F, {{100, -0.01, 10.01}, {100, -0.01, 10.01}}}} //
},
OutputObjHandlingPolicy::AnalysisObject,
false,
true};

void init(InitContext&)
{
if (!trackFilterString->empty()) {
Expand Down