Skip to content

Commit be24fe8

Browse files
committed
[ntuple][NFC] Move RNTupleJoinProcessor ctor to bottom
1 parent d4dff39 commit be24fe8

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

tree/ntuple/v7/inc/ROOT/RNTupleProcessor.hxx

+16-16
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,22 @@ private:
541541
/// This way, they can be accessed from the processor's entry as `auxNTupleName.fieldName`.
542542
void SetModel(std::unique_ptr<RNTupleModel> primaryModel, std::vector<std::unique_ptr<RNTupleModel>> auxModels);
543543

544+
/////////////////////////////////////////////////////////////////////////////
545+
/// \brief Connect all fields, once the primary and all auxiliary RNTuples have been added.
546+
void ConnectFields();
547+
548+
/////////////////////////////////////////////////////////////////////////////
549+
/// \brief Populate fJoinFieldTokens with tokens for join fields belonging to the main RNTuple in the join model.
550+
///
551+
/// \param[in] joinFields The names of the fields used in the join.
552+
void SetJoinFieldTokens(const std::vector<std::string> &joinFields)
553+
{
554+
fJoinFieldTokens.reserve(joinFields.size());
555+
for (const auto &fieldName : joinFields) {
556+
fJoinFieldTokens.emplace_back(fEntry->GetToken(fieldName));
557+
}
558+
}
559+
544560
/////////////////////////////////////////////////////////////////////////////
545561
/// \brief Construct a new RNTupleJoinProcessor.
546562
///
@@ -562,22 +578,6 @@ private:
562578
std::unique_ptr<RNTupleModel> primaryModel = nullptr,
563579
std::vector<std::unique_ptr<RNTupleModel>> auxModels = {});
564580

565-
/////////////////////////////////////////////////////////////////////////////
566-
/// \brief Connect all fields, once the primary and all auxiliary RNTuples have been added.
567-
void ConnectFields();
568-
569-
/////////////////////////////////////////////////////////////////////////////
570-
/// \brief Populate fJoinFieldTokens with tokens for join fields belonging to the main RNTuple in the join model.
571-
///
572-
/// \param[in] joinFields The names of the fields used in the join.
573-
void SetJoinFieldTokens(const std::vector<std::string> &joinFields)
574-
{
575-
fJoinFieldTokens.reserve(joinFields.size());
576-
for (const auto &fieldName : joinFields) {
577-
fJoinFieldTokens.emplace_back(fEntry->GetToken(fieldName));
578-
}
579-
}
580-
581581
public:
582582
RNTupleJoinProcessor(const RNTupleJoinProcessor &) = delete;
583583
RNTupleJoinProcessor operator=(const RNTupleJoinProcessor &) = delete;

0 commit comments

Comments
 (0)