Skip to content

Commit 19ab351

Browse files
davidrohrBarthelemy
authored andcommitted
Adapt to usage of ConstMCLabelContainer in TPC (#510)
Force merging as requested.
1 parent 1d2f06d commit 19ab351

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

Modules/TPC/src/Clusters.cxx

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424

2525
#include <bitset>
2626

27-
using namespace o2::framework;
28-
using namespace o2::header;
29-
using namespace o2::tpc;
30-
3127
// root includes
3228
#include <TCanvas.h>
3329
#include <TH1.h>
@@ -47,6 +43,11 @@ using namespace o2::tpc;
4743
#include "QualityControl/QcInfoLogger.h"
4844
#include "TPC/Clusters.h"
4945

46+
using namespace o2::framework;
47+
using namespace o2::header;
48+
using namespace o2::tpc;
49+
using namespace o2::dataformats;
50+
5051
namespace o2::quality_control_modules::tpc
5152
{
5253

@@ -127,7 +128,6 @@ void Clusters::monitorData(o2::framework::ProcessingContext& ctx)
127128

128129
constexpr static size_t NSectors = o2::tpc::Sector::MAXSECTOR;
129130

130-
std::vector<decltype(std::declval<InputRecord>().get<MCLabelContainer*>(DataRef{ nullptr, nullptr, nullptr }))> mcInputs;
131131
std::vector<gsl::span<const char>> inputs;
132132
struct InputRef {
133133
DataRef data;
@@ -181,10 +181,11 @@ void Clusters::monitorData(o2::framework::ProcessingContext& ctx)
181181

182182
ClusterNativeAccess clusterIndex;
183183
std::unique_ptr<ClusterNative[]> clusterBuffer;
184-
MCLabelContainer clustersMCBuffer;
184+
ClusterNativeHelper::ConstMCLabelContainerViewWithBuffer clustersMCBufferDummy;
185+
std::vector<ConstMCLabelContainerView> mcInputsDummy;
185186
memset(&clusterIndex, 0, sizeof(clusterIndex));
186-
ClusterNativeHelper::Reader::fillIndex(clusterIndex, clusterBuffer, clustersMCBuffer,
187-
inputs, mcInputs, [&validInputs](auto& index) { return validInputs.test(index); });
187+
ClusterNativeHelper::Reader::fillIndex(clusterIndex, clusterBuffer, clustersMCBufferDummy,
188+
inputs, mcInputsDummy, [&validInputs](auto& index) { return validInputs.test(index); });
188189

189190
for (int isector = 0; isector < o2::tpc::constants::MAXSECTOR; ++isector) {
190191
for (int irow = 0; irow < o2::tpc::constants::MAXGLOBALPADROW; ++irow) {

0 commit comments

Comments
 (0)