Skip to content

DPL Analysis: Fix for grouping with a joined iterator #3568

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 2 commits into from
May 12, 2020
Merged

DPL Analysis: Fix for grouping with a joined iterator #3568

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
9563bc5
DPL Analysis: Fix for grouping with a joined iterator
aalkin May 12, 2020
c7cb7ac
Minor fix
aalkin May 12, 2020
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
36 changes: 31 additions & 5 deletions Analysis/Tutorials/src/associatedExample.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ DECLARE_SOA_TABLE(EtaPhi, "AOD", "ETAPHI",
etaphi::Eta, etaphi::Phi);
DECLARE_SOA_TABLE(EtaPhiPt, "AOD", "ETAPHIPT",
etaphi::Eta, etaphi::Phi, etaphi::Pt);

namespace collision
{
DECLARE_SOA_COLUMN(Mult, mult, int32_t);
} // namespace collision

DECLARE_SOA_TABLE(CollisionsExtra, "AOD", "COLEXTRA",
collision::Mult);
} // namespace o2::aod

using namespace o2;
Expand All @@ -48,11 +56,20 @@ struct ATask {
}
};

struct MTask {
Produces<aod::CollisionsExtra> colextra;

void process(aod::Collision const& collision, aod::Tracks const& tracks)
{
colextra(tracks.size());
}
};

struct BTask {
void process(aod::Collision const& collision, soa::Join<aod::Tracks, aod::EtaPhi> const& extTracks)
{
// LOG(INFO) << "TF: " << collision.timeframeID() << std::endl;
LOG(INFO) << "Rows: " << extTracks.asArrowTable()->num_rows() << std::endl;
LOGF(INFO, "ID: %d", collision.globalIndex());
LOGF(INFO, "Tracks: %d", extTracks.size());
for (auto& track : extTracks) {
LOGF(INFO, "(%f, %f) - (%f, %f)", track.eta(), track.phi(), track.etas(), track.phis());
}
Expand All @@ -62,8 +79,15 @@ struct BTask {
struct CTask {
void process(aod::Collision const& collision, soa::Concat<aod::EtaPhi, aod::EtaPhiPt> const& concatenated)
{
// LOG(INFO) << "TF: " << collision.timeframeID() << std::endl;
LOG(INFO) << "Rows: " << concatenated.asArrowTable()->num_rows() << std::endl;
LOGF(INFO, "ID: %d", collision.globalIndex());
LOGF(INFO, "Tracks: %d", concatenated.size());
}
};

struct TTask {
void process(soa::Join<aod::Collisions, aod::CollisionsExtra>::iterator const& col, aod::Tracks const& tracks)
{
LOGF(INFO, "ID: %d; %d == %d", col.globalIndex(), col.mult(), tracks.size());
}
};

Expand All @@ -72,5 +96,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const&)
return WorkflowSpec{
adaptAnalysisTask<ATask>("produce-etaphi"),
adaptAnalysisTask<BTask>("consume-etaphi"),
adaptAnalysisTask<CTask>("consume-etaphi-twice")};
adaptAnalysisTask<CTask>("consume-etaphi-twice"),
adaptAnalysisTask<MTask>("produce-mult"),
adaptAnalysisTask<TTask>("consume-mult")};
}
10 changes: 8 additions & 2 deletions Framework/Core/include/Framework/AnalysisTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,13 @@ struct AnalysisDataProcessorBuilder {
constexpr bool isIndexTo()
{
if constexpr (soa::is_type_with_binding_v<C>) {
return std::is_same_v<typename C::binding_t, B>;
if constexpr (soa::is_type_with_originals_v<std::decay_t<B>>) {
using TT = typename framework::pack_element_t<0, typename std::decay_t<B>::originals>;
return std::is_same_v<typename C::binding_t, TT>;
} else {
using TT = std::decay_t<B>;
return std::is_same_v<typename C::binding_t, TT>;
}
}
return false;
}
Expand Down Expand Up @@ -601,7 +607,7 @@ struct AnalysisDataProcessorBuilder {
static_assert(((soa::is_soa_iterator_t<std::decay_t<Associated>>::value == false) && ...),
"Associated arguments of process() should not be iterators");
auto associatedTables = AnalysisDataProcessorBuilder::bindAssociatedTables(inputs, &C::process, infos);
if constexpr (soa::is_soa_iterator_t<G>::value) {
if constexpr (soa::is_soa_iterator_t<std::decay_t<G>>::value) {
// grouping case
(groupingTable.bindExternalIndices(&std::get<std::decay_t<Associated>>(associatedTables)), ...);
auto slicer = GroupSlicer(groupingTable, associatedTables);
Expand Down