Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -450,14 +450,8 @@ std::vector<DataProcessorSpec> defineDataProcessing(ConfigContext const& config)
Inputs checkerInputs;
if (bypassProxies != ProxyBypass::None) {
checkerInputs.emplace_back(InputSpec{"datain", ConcreteDataTypeMatcher{"TST", "DATA"}, Lifetime::Timeframe});
//for (unsigned int i = 0; i < pState->nChannels; i++) {
// checkerInputs.emplace_back(InputSpec{{"datain"}, "TST", "DATA", i, Lifetime::Timeframe});
//}
} else {
checkerInputs.emplace_back(InputSpec{"datain", ConcreteDataTypeMatcher{"PRX", "DATA"}, Lifetime::Timeframe});
//for (unsigned int i = 0; i < pState->nChannels; i++) {
// checkerInputs.emplace_back(InputSpec{{"datain"}, "PRX", "DATA", i, Lifetime::Timeframe});
//}
}
workflow.emplace_back(DataProcessorSpec{"checker",
std::move(checkerInputs),
Expand Down
1 change: 0 additions & 1 deletion Framework/Core/test/test_DataAllocator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,6 @@ DataProcessorSpec getSinkSpec()

LOG(info) << "extracting POD vector";
// TODO: use the ReturnType helper once implemented
//InputRecord::ReturnType<std::vector<int>> podvector;
decltype(std::declval<InputRecord>().get<std::vector<int>>(DataRef{nullptr, nullptr, nullptr})) podvector;
podvector = pc.inputs().get<std::vector<int>>("inputPODvector");
ASSERT_ERROR(podvector.size() == 3);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "Framework/DataAllocator.h"

// we need to add workflow options before including Framework/runDataProcessing
//void customize(std::vector<ConfigParamSpec>& workflowOptions)
//{
//}

Expand Down
3 changes: 0 additions & 3 deletions Framework/Core/test/test_DataOutputDirector.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ TEST_CASE("TestDataOutputDirector")
std::string keepString("AOD/UNO/0:tr1:c1/c2/c3:fn1,AOD/UNO/0::c4");
dod.readString(keepString);
dod.setFilenameBase(mydfn);
//dod.printOut(); printf("\n\n");

auto ds = dod.getDataOutputDescriptors(dh);

Expand Down Expand Up @@ -59,7 +58,6 @@ TEST_CASE("TestDataOutputDirector")

dod.reset();
std::tie(rdn, dfn, fmode, mfs, ntf) = dod.readJsonString(jsonString);
//dod.printOut(); printf("\n\n");
ds = dod.getDataOutputDescriptors(dh);

REQUIRE(ds.size() == 1);
Expand Down Expand Up @@ -106,7 +104,6 @@ TEST_CASE("TestDataOutputDirector")
dod.reset();
std::tie(rdn, dfn, fmode, mfs, ntf) = dod.readJson(jsonFile);
dod.setFilenameBase("AnalysisResults");
//dod.printOut(); printf("\n\n");
ds = dod.getDataOutputDescriptors(dh);

REQUIRE(ds.size() == 2);
Expand Down
1 change: 0 additions & 1 deletion Framework/Core/test/test_Parallel.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

#include <boost/algorithm/string.hpp>


using namespace o2::framework;

struct FakeCluster {
Expand Down
3 changes: 0 additions & 3 deletions Framework/Core/test/test_ParallelPipeline.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ std::vector<DataProcessorSpec> defineDataProcessing(ConfigContext const&)
LOG(debug) << "instance " << parallelContext.index1D() << " of " << parallelContext.index1DSize() << ": "
<< *input.spec << ": " << *((int*)input.payload);
auto const* dataheader = DataRefUtils::getHeader<o2::header::DataHeader*>(input);
//auto& data = ctx.outputs().make<int>(OutputRef{"output", dataheader->subSpecification});
auto& data = ctx.outputs().make<int>(Output{"TST", "PREPROC", dataheader->subSpecification});
ASSERT_ERROR(ctx.inputs().get<int>(input.spec->binding.c_str()) == parallelContext.index1D());
data = parallelContext.index1D();
Expand All @@ -84,10 +83,8 @@ std::vector<DataProcessorSpec> defineDataProcessing(ConfigContext const&)
auto const* dataheader = DataRefUtils::getHeader<o2::header::DataHeader*>(input);
// TODO: there is a bug in the API for using OutputRef, returns an rvalue which can not be bound to
// lvalue reference
//auto& data = ctx.outputs().make<int>(OutputRef{"output", dataheader->subSpecification});
auto& data = ctx.outputs().make<int>(Output{"TST", "DATA", dataheader->subSpecification});
data = ctx.inputs().get<int>(input.spec->binding.c_str());
//auto& meta = ctx.outputs().make<int>(OutputRef{"metadt", dataheader->subSpecification});
auto& meta = ctx.outputs().make<int>(Output{"TST", "META", dataheader->subSpecification});
meta = dataheader->subSpecification;
}
Expand Down
5 changes: 0 additions & 5 deletions Framework/Core/test/test_Root2ArrowTable.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ TEST_CASE("RootTree2Table")
t1.Branch("ij", ij, "ij[2]/I");
//fill the tree
for (Int_t i = 0; i < 1000; i++) {
//gRandom->Rannor(xyz[0], xyz[1]);
xyz[0] = 1;
xyz[1] = 2;
xyz[2] = 3;
Expand Down Expand Up @@ -92,16 +91,12 @@ TEST_CASE("RootTree2Table")
REQUIRE(array->length() == 3000);
const float* c = reinterpret_cast<float const*>(array->values()->data());

//auto array = std::static_pointer_cast<arrow::FixedSizeBinaryArray>(table->column(0)->chunk(0));
//CHECK_EQUAL(array->byte_width(), sizeof(float[3]));
//const float* c = reinterpret_cast<float const*>(array->Value(0));

CHECK(c[0] == 1);
CHECK(c[1] == 2);
CHECK(c[2] == 1);
}
{
//auto values = std::static_pointer_cast<arrow::FixedSizeBinaryArray>(table->column(1)->chunk(0));
auto chunkToUse = table->column(1)->chunk(0);
chunkToUse = std::dynamic_pointer_cast<arrow::FixedSizeListArray>(chunkToUse)->values();
auto array = std::static_pointer_cast<arrow::Int32Array>(chunkToUse);
Expand Down
2 changes: 0 additions & 2 deletions Framework/Core/test/test_StaticFor.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ TEST_CASE("TestStaticFor")
constexpr int index = i.value;

// compiler will complain if constexpr is not enforced for index access:
//CONST_STR(staticNames[index]); // works
//CONST_STR(staticNames[i.value]); // fails

constexpr auto sayHello = CONST_STR("Hello ") + CONST_STR(staticNames[index]);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ std::vector<DataProcessorSpec> defineDataProcessing(ConfigContext const& config)
ASSERT_ERROR(*reinterpret_cast<size_t const*>(ref.payload) == sd->initialValue + nSequencePayloads);
++nSequencePayloads;
}
//LOG(info) << "input " << ref.spec->binding << " has data {" << dh->dataOrigin.as<std::string>() << "/" << dh->dataDescription.as<std::string>() << "/" << dh->subSpecification << "}: " << *reinterpret_cast<size_t const*>(ref.payload);
}
for (auto const& [channel, count] : active) {
++counters[channel];
Expand Down