Skip to content

Speed up reading *Auxiliary fields in RNTupleTempSource #49902

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
cmsbuild merged 2 commits into from
Jan 23, 2026
Merged

Speed up reading *Auxiliary fields in RNTupleTempSource #49902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23c2c4f
Remove unnecessary backwards compatibility code paths
makortel Jan 22, 2026
23de48d
Speed up reading the *Auxiliary fields by caching the View object
makortel Jan 22, 2026
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
37 changes: 6 additions & 31 deletions FWIO/RNTupleTempInput/src/RootFile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@
#include "FWCore/ServiceRegistry/interface/ModuleCallingContext.h"

//used for backward compatibility
#include "DataFormats/Provenance/interface/EventAux.h"
#include "DataFormats/Provenance/interface/LuminosityBlockAux.h"
#include "DataFormats/Provenance/interface/RunAux.h"
#include "FWCore/ParameterSet/interface/ParameterSetConverter.h"

#include "Rtypes.h"
Expand Down Expand Up @@ -1064,16 +1061,8 @@ namespace edm::rntuple_temp {
// Already read.
return eventAuxCache_;
}
if (fileFormatVersion().newAuxiliary()) {
EventAuxiliary* pEvAux = &eventAuxCache_;
eventTree_.fillAux<EventAuxiliary>(pEvAux);
} else {
// for backward compatibility.
EventAux eventAux;
EventAux* pEvAux = &eventAux;
eventTree_.fillAux<EventAux>(pEvAux);
conversion(eventAux, eventAuxCache_);
}
EventAuxiliary* pEvAux = &eventAuxCache_;
eventTree_.fillAux<EventAuxiliary>(pEvAux);
lastEventEntryNumberRead_ = eventTree_.entryNumber();
return eventAuxCache_;
}
Expand Down Expand Up @@ -1139,15 +1128,8 @@ namespace edm::rntuple_temp {

std::shared_ptr<LuminosityBlockAuxiliary> RootFile::fillLumiAuxiliary() {
auto lumiAuxiliary = std::make_shared<LuminosityBlockAuxiliary>();
if (fileFormatVersion().newAuxiliary()) {
LuminosityBlockAuxiliary* pLumiAux = lumiAuxiliary.get();
lumiTree_.fillAux<LuminosityBlockAuxiliary>(pLumiAux);
} else {
LuminosityBlockAux lumiAux;
LuminosityBlockAux* pLumiAux = &lumiAux;
lumiTree_.fillAux<LuminosityBlockAux>(pLumiAux);
conversion(lumiAux, *lumiAuxiliary);
}
LuminosityBlockAuxiliary* pLumiAux = lumiAuxiliary.get();
lumiTree_.fillAux<LuminosityBlockAuxiliary>(pLumiAux);
if (daqProvenanceHelper_) {
lumiAuxiliary->setProcessHistoryID(daqProvenanceHelper_->mapProcessHistoryID(lumiAuxiliary->processHistoryID()));
}
Expand All @@ -1159,15 +1141,8 @@ namespace edm::rntuple_temp {

std::shared_ptr<RunAuxiliary> RootFile::fillRunAuxiliary() {
auto runAuxiliary = std::make_shared<RunAuxiliary>();
if (fileFormatVersion().newAuxiliary()) {
RunAuxiliary* pRunAux = runAuxiliary.get();
runTree_.fillAux<RunAuxiliary>(pRunAux);
} else {
RunAux runAux;
RunAux* pRunAux = &runAux;
runTree_.fillAux<RunAux>(pRunAux);
conversion(runAux, *runAuxiliary);
}
RunAuxiliary* pRunAux = runAuxiliary.get();
runTree_.fillAux<RunAuxiliary>(pRunAux);
if (daqProvenanceHelper_) {
runAuxiliary->setProcessHistoryID(daqProvenanceHelper_->mapProcessHistoryID(runAuxiliary->processHistoryID()));
}
Expand Down
15 changes: 14 additions & 1 deletion FWIO/RNTupleTempInput/src/RootRNTuple.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ RootRNTuple.h // used by ROOT input sources
#include "DataFormats/Provenance/interface/ProductDescription.h"
#include "DataFormats/Provenance/interface/BranchID.h"
#include "DataFormats/Provenance/interface/IndexIntoFile.h"
#include "DataFormats/Provenance/interface/EventAuxiliary.h"
#include "DataFormats/Provenance/interface/LuminosityBlockAuxiliary.h"
#include "DataFormats/Provenance/interface/RunAuxiliary.h"
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/ServiceRegistry/interface/ServiceRegistryfwd.h"
#include "FWCore/Utilities/interface/BranchType.h"
Expand All @@ -25,6 +28,7 @@ RootRNTuple.h // used by ROOT input sources
#include <vector>
#include <unordered_set>
#include <unordered_map>
#include <variant>

#include "ROOT/RNTuple.hxx"
#include "ROOT/RNTupleReader.hxx"
Expand Down Expand Up @@ -141,7 +145,11 @@ namespace edm::rntuple_temp {
template <typename T>
void fillAux(T*& pAux) {
try {
auto view = reader_->GetView(auxDesc_, pAux);
if (std::holds_alternative<std::monostate>(auxView_)) {
auxView_ = reader_->GetView(auxDesc_, pAux);
}
auto& view = std::get<ROOT::RNTupleView<T>>(auxView_);
view.BindRawPtr(pAux);
view(entryNumber_);
} catch (cms::Exception const& e) {
throw Exception(errors::FileReadError, "", e);
Expand Down Expand Up @@ -201,6 +209,11 @@ namespace edm::rntuple_temp {
unsigned long treeAutoFlush_ = 0;
bool promptRead_;
std::unique_ptr<RootDelayedReaderBase> rootDelayedReader_;
std::variant<std::monostate,
ROOT::RNTupleView<edm::EventAuxiliary>,
ROOT::RNTupleView<edm::LuminosityBlockAuxiliary>,
ROOT::RNTupleView<edm::RunAuxiliary>>
auxView_;
};
} // namespace edm::rntuple_temp
#endif