Skip to content

Add metadata to AOD #7503

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
sawenzel merged 6 commits into from
Nov 9, 2021
Merged

Add metadata to AOD #7503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec10ca3
Add metadata to AOD
nburmaso Nov 3, 2021
8652cb1
Add metadata to AOD: pass production tags using separate configurables
nburmaso Nov 3, 2021
8ec6cda
Merge branch 'dev' of https://github.com/AliceO2Group/AliceO2 into ao…
nburmaso Nov 4, 2021
1a5e08e
Add metadata to AOD: set data type
nburmaso Nov 4, 2021
25e9f1c
Add metadata to AOD: forgotten initializers
nburmaso Nov 4, 2021
de720e7
Add metadata to AOD: fix code according to comments
nburmaso Nov 5, 2021
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
17 changes: 12 additions & 5 deletions Detectors/AOD/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

o2_add_library(
add_library(AODProducerWorkflow INTERFACE)

target_link_libraries(
AODProducerWorkflow
SOURCES src/AODProducerWorkflowSpec.cxx
PUBLIC_LINK_LIBRARIES
INTERFACE
O2::DetectorsVertexing
O2::FT0Workflow
O2::FDDWorkflow
Expand All @@ -30,12 +31,18 @@ o2_add_library(
O2::Steer
O2::TPCWorkflow
)

target_include_directories(AODProducerWorkflow INTERFACE include)

add_library(internal::AODProducerWorkflow ALIAS AODProducerWorkflow)

o2_add_executable(
workflow
COMPONENT_NAME aod-producer
SOURCES src/aod-producer-workflow.cxx
PUBLIC_LINK_LIBRARIES O2::AODProducerWorkflow
SOURCES src/aod-producer-workflow.cxx src/AODProducerWorkflowSpec.cxx
PUBLIC_LINK_LIBRARIES internal::AODProducerWorkflow O2::Version
)

o2_add_executable(
standalone-aod-producer
COMPONENT_NAME reco
Expand Down
13 changes: 11 additions & 2 deletions Detectors/AOD/include/AODProducerWorkflow/AODProducerWorkflowSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "ReconstructionDataFormats/VtxTrackIndex.h"
#include "SimulationDataFormat/MCCompLabel.h"
#include "Steer/MCKinematicsReader.h"
#include "TMap.h"
#include "TStopwatch.h"

#include <boost/functional/hash.hpp>
Expand Down Expand Up @@ -191,7 +192,7 @@ typedef boost::unordered_map<Triplet_t, int, TripletHash, TripletEqualTo> Triple
class AODProducerWorkflowDPL : public Task
{
public:
AODProducerWorkflowDPL(GID::mask_t src, std::shared_ptr<DataRequest> dataRequest, bool useMC = true) : mInputSources(src), mDataRequest(dataRequest), mUseMC(useMC) {}
AODProducerWorkflowDPL(GID::mask_t src, std::shared_ptr<DataRequest> dataRequest, std::string resFile, bool useMC = true) : mInputSources(src), mDataRequest(dataRequest), mResFile{resFile}, mUseMC(useMC) {}
~AODProducerWorkflowDPL() override = default;
void init(InitContext& ic) final;
void run(ProcessingContext& pc) final;
Expand All @@ -206,6 +207,11 @@ class AODProducerWorkflowDPL : public Task
int64_t mTFNumber{-1};
int mTruncate{1};
int mRecoOnly{0};
TString mResFile{"AO2D"};
TString mLPMProdTag{""};
TString mAnchorPass{""};
TString mAnchorProd{""};
TString mRecoPass{""};
TStopwatch mTimer;

// unordered map connects global indices and table indices of barrel tracks
Expand All @@ -215,6 +221,9 @@ class AODProducerWorkflowDPL : public Task

TripletsMap_t mToStore;

// MC production metadata holder
TMap mMetaData;

std::shared_ptr<DataRequest> mDataRequest;

// truncation is enabled by default
Expand Down Expand Up @@ -354,7 +363,7 @@ class AODProducerWorkflowDPL : public Task
};

/// create a processor spec
framework::DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool useMC);
framework::DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool useMC, std::string resFile);

} // namespace o2::aodproducer

Expand Down
47 changes: 43 additions & 4 deletions Detectors/AOD/src/AODProducerWorkflowSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,13 @@
#include "SimulationDataFormat/MCEventLabel.h"
#include "SimulationDataFormat/MCTrack.h"
#include "SimulationDataFormat/MCTruthContainer.h"
#include "O2Version.h"
#include "TMath.h"
#include "MathUtils/Utils.h"
#include "Math/SMatrix.h"
#include <TMatrixD.h>
#include "TMatrixD.h"
#include "TString.h"
#include "TObjString.h"
#include <map>
#include <unordered_map>
#include <vector>
Expand Down Expand Up @@ -855,6 +858,10 @@ uint8_t AODProducerWorkflowDPL::getTRDPattern(const o2::trd::TrackTRD& track)
void AODProducerWorkflowDPL::init(InitContext& ic)
{
mTimer.Stop();
mLPMProdTag = ic.options().get<string>("lpmp-prod-tag");
mAnchorPass = ic.options().get<string>("anchor-pass");
mAnchorProd = ic.options().get<string>("anchor-prod");
mRecoPass = ic.options().get<string>("reco-pass");
mTFNumber = ic.options().get<int64_t>("aod-timeframe-id");
mRecoOnly = ic.options().get<int>("reco-mctracks-only");
mTruncate = ic.options().get<int>("enable-truncation");
Expand Down Expand Up @@ -901,6 +908,34 @@ void AODProducerWorkflowDPL::init(InitContext& ic)
// Needed by MCH track extrapolation
o2::base::GeometryManager::loadGeometry();

// writing metadata if it's not yet in AOD file
// note: `--aod-writer-resmode "UPDATE"` has to be used,
// so that metadata is not overwritten
mResFile += ".root";
auto* fResFile = TFile::Open(mResFile, "UPDATE");
if (!fResFile) {
LOGF(fatal, "Could not open file %s", mResFile);
}
if (!fResFile->FindObjectAny("metaData")) {
// populating metadata map
TString dataType = mUseMC ? "MC" : "RAW";
mMetaData.Add(new TObjString("DataType"), new TObjString(dataType));
mMetaData.Add(new TObjString("Run"), new TObjString("3"));
TString O2Version = o2::fullVersion();
TString ROOTVersion = ROOT_RELEASE;
mMetaData.Add(new TObjString("O2Version"), new TObjString(O2Version));
mMetaData.Add(new TObjString("ROOTVersion"), new TObjString(ROOTVersion));
mMetaData.Add(new TObjString("RecoPassName"), new TObjString(mRecoPass));
mMetaData.Add(new TObjString("AnchorProduction"), new TObjString(mAnchorProd));
mMetaData.Add(new TObjString("AnchorPassName"), new TObjString(mAnchorPass));
mMetaData.Add(new TObjString("LPMProductionTag"), new TObjString(mLPMProdTag));
LOGF(info, "Metadata: writing into %s", mResFile);
fResFile->WriteObject(&mMetaData, "metaData");
} else {
LOGF(fatal, "Metadata: target file %s already has metadata", mResFile);
}
fResFile->Close();

mTimer.Reset();
}

Expand Down Expand Up @@ -991,7 +1026,7 @@ void AODProducerWorkflowDPL::run(ProcessingContext& pc)
int runNumber = int(dh->runNumber);
if (mTFNumber == -1L) {
// TODO has to be made globally unique (by using absolute time of TF). For now is unique within the run
tfNumber = dh->tfCounter; //getTFNumber(startIR, runNumber);
tfNumber = dh->tfCounter; // getTFNumber(startIR, runNumber);
} else {
tfNumber = mTFNumber;
}
Expand Down Expand Up @@ -1327,7 +1362,7 @@ void AODProducerWorkflowDPL::endOfStream(EndOfStreamContext& ec)
mTimer.CpuTime(), mTimer.RealTime(), mTimer.Counter() - 1);
}

DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool useMC)
DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool useMC, std::string resFile)
{
std::vector<OutputSpec> outputs;
auto dataRequest = std::make_shared<DataRequest>();
Expand Down Expand Up @@ -1366,10 +1401,14 @@ DataProcessorSpec getAODProducerWorkflowSpec(GID::mask_t src, bool useMC)
"aod-producer-workflow",
dataRequest->inputs,
outputs,
AlgorithmSpec{adaptFromTask<AODProducerWorkflowDPL>(src, dataRequest, useMC)},
AlgorithmSpec{adaptFromTask<AODProducerWorkflowDPL>(src, dataRequest, resFile, useMC)},
Options{
ConfigParamSpec{"aod-timeframe-id", VariantType::Int64, -1L, {"Set timeframe number"}},
ConfigParamSpec{"enable-truncation", VariantType::Int, 1, {"Truncation parameter: 1 -- on, != 1 -- off"}},
ConfigParamSpec{"lpmp-prod-tag", VariantType::String, "", {"LPMProductionTag"}},
ConfigParamSpec{"anchor-pass", VariantType::String, "", {"AnchorPassName"}},
ConfigParamSpec{"anchor-prod", VariantType::String, "", {"AnchorProduction"}},
ConfigParamSpec{"reco-pass", VariantType::String, "", {"RecoPassName"}},
ConfigParamSpec{"reco-mctracks-only", VariantType::Int, 0, {"Store only reconstructed MC tracks and their mothers/daughters. 0 -- off, != 0 -- on"}}}};
}

Expand Down
3 changes: 2 additions & 1 deletion Detectors/AOD/src/aod-producer-workflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,13 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
{
o2::conf::ConfigurableParam::updateFromString(configcontext.options().get<std::string>("configKeyValues"));
auto useMC = !configcontext.options().get<bool>("disable-mc");
auto resFile = configcontext.options().get<std::string>("aod-writer-resfile");

GID::mask_t allowedSrc = GID::getSourcesMask("ITS,MFT,MCH,TPC,ITS-TPC,ITS-TPC-TOF,TPC-TOF,MFT-MCH,FT0,FV0,FDD,TPC-TRD,ITS-TPC-TRD,FT0,FV0,FDD,ZDC");
GID::mask_t src = allowedSrc & GID::getSourcesMask(configcontext.options().get<std::string>("info-sources"));

WorkflowSpec specs;
specs.emplace_back(o2::aodproducer::getAODProducerWorkflowSpec(src, useMC));
specs.emplace_back(o2::aodproducer::getAODProducerWorkflowSpec(src, useMC, resFile));

o2::globaltracking::InputHelper::addInputSpecs(configcontext, specs, src, src, src, useMC, src);
o2::globaltracking::InputHelper::addInputSpecsPVertex(configcontext, specs, useMC);
Expand Down