Skip to content

Commit 0f4e58b

Browse files
committed
Cleanup
1 parent 30d8945 commit 0f4e58b

16 files changed

+280
-5886
lines changed

Framework/Core/include/Framework/ASoA.h

Lines changed: 45 additions & 1921 deletions
Large diffs are not rendered by default.

Framework/Core/include/Framework/ASoAHelpers.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,16 +1348,6 @@ auto combinations(const BP& binningPolicy, int categoryNeighbours, const T1& out
13481348
}
13491349
}
13501350

1351-
// template <soa::soa_table... T2s>
1352-
// auto combinations(const o2::framework::expressions::Filter& filter, const T2s&... tables)
1353-
// {
1354-
// if constexpr (isSameType<T2s...>()) {
1355-
// return CombinationsGenerator<CombinationsStrictlyUpperIndexPolicy<Filtered<T2s>...>>(CombinationsStrictlyUpperIndexPolicy(tables.select(filter)...));
1356-
// } else {
1357-
// return CombinationsGenerator<CombinationsUpperIndexPolicy<Filtered<T2s>...>>(CombinationsUpperIndexPolicy(tables.select(filter)...));
1358-
// }
1359-
// }
1360-
13611351
template <soa::ng_table... T2s>
13621352
auto combinations(const o2::framework::expressions::Filter& filter, const T2s&... tables)
13631353
{
@@ -1376,12 +1366,6 @@ CombinationsGenerator<P2<T2s...>> combinations(const P2<T2s...>& policy)
13761366
return CombinationsGenerator<P2<T2s...>>(policy);
13771367
}
13781368

1379-
// template <template <typename...> typename P2, soa::soa_table... T2s>
1380-
// CombinationsGenerator<P2<Filtered<T2s>...>> combinations(P2<T2s...>&&, const o2::framework::expressions::Filter& filter, const T2s&... tables)
1381-
// {
1382-
// return CombinationsGenerator<P2<Filtered<T2s>...>>(P2<Filtered<T2s>...>(tables.select(filter)...));
1383-
// }
1384-
13851369
template <template <typename...> typename P2, soa::ng_table... T2s>
13861370
CombinationsGenerator<P2<Filtered<T2s>...>> combinations(P2<T2s...>&&, const o2::framework::expressions::Filter& filter, const T2s&... tables)
13871371
{

Framework/Core/include/Framework/AnalysisDataModel.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ namespace o2
2929
{
3030
namespace aod
3131
{
32-
// This is required to register SOA_TABLEs inside
33-
// the o2::aod namespace.
34-
// DECLARE_SOA_METADATA();
35-
DECLARE_SOA_VERSIONING();
36-
3732
namespace bc
3833
{
3934
DECLARE_SOA_COLUMN(RunNumber, runNumber, int); //! Run number

0 commit comments

Comments
 (0)