From 427ada7bf47191f54640e2412e5afccfa2a18f46 Mon Sep 17 00:00:00 2001
From: Enrico Guiraud <enrico.guiraud@cern.ch>
Date: Thu, 7 Jun 2018 17:21:48 +0200
Subject: [PATCH] [DF] Fix Snapshot of aliased custom columns
Fixes ROOT-9452
---
tree/dataframe/inc/ROOT/RDFInterface.hxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tree/dataframe/inc/ROOT/RDFInterface.hxx b/tree/dataframe/inc/ROOT/RDFInterface.hxx
index d7da15a5c19..4145732fcc8 100644
--- a/tree/dataframe/inc/ROOT/RDFInterface.hxx
+++ b/tree/dataframe/inc/ROOT/RDFInterface.hxx
@@ -419,7 +419,9 @@ public:
const auto &customCols = df->GetCustomColumnNames();
const auto dontConvertVector = false;
- for (auto &c : columnList) {
+ const auto validCols =
+ RDFInternal::GetValidatedColumnNames(*df, columnList.size(), columnList, fValidCustomColumns, fDataSource);
+ for (auto &c : validCols) {
const auto isCustom = std::find(customCols.begin(), customCols.end(), c) != customCols.end();
snapCall << RDFInternal::ColumnName2ColumnTypeName(c, nsID, tree, fDataSource, isCustom, dontConvertVector)
<< ", ";
--
GitLab