From cd2008fc3641841895b9bd6a8eb21c095d558cfb Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Fri, 19 Jan 2024 08:41:04 +0100 Subject: [PATCH] DPL: drop commented code --- .../Core/test/benchmark_ExternalFairMQDeviceProxies.cxx | 6 ------ Framework/Core/test/test_DataAllocator.cxx | 1 - Framework/Core/test/test_DataDescriptorMatcherWorkflow.cxx | 1 - Framework/Core/test/test_DataOutputDirector.cxx | 3 --- Framework/Core/test/test_Parallel.cxx | 1 - Framework/Core/test/test_ParallelPipeline.cxx | 3 --- Framework/Core/test/test_Root2ArrowTable.cxx | 5 ----- Framework/Core/test/test_StaticFor.cxx | 2 -- .../Core/test/test_VariablePayloadSequenceWorkflow.cxx | 1 - 9 files changed, 23 deletions(-) diff --git a/Framework/Core/test/benchmark_ExternalFairMQDeviceProxies.cxx b/Framework/Core/test/benchmark_ExternalFairMQDeviceProxies.cxx index bdb4deb443021..c116ed81537ce 100644 --- a/Framework/Core/test/benchmark_ExternalFairMQDeviceProxies.cxx +++ b/Framework/Core/test/benchmark_ExternalFairMQDeviceProxies.cxx @@ -450,14 +450,8 @@ std::vector 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), diff --git a/Framework/Core/test/test_DataAllocator.cxx b/Framework/Core/test/test_DataAllocator.cxx index 894fb5f38368a..5c29040a37450 100644 --- a/Framework/Core/test/test_DataAllocator.cxx +++ b/Framework/Core/test/test_DataAllocator.cxx @@ -338,7 +338,6 @@ DataProcessorSpec getSinkSpec() LOG(info) << "extracting POD vector"; // TODO: use the ReturnType helper once implemented - //InputRecord::ReturnType> podvector; decltype(std::declval().get>(DataRef{nullptr, nullptr, nullptr})) podvector; podvector = pc.inputs().get>("inputPODvector"); ASSERT_ERROR(podvector.size() == 3); diff --git a/Framework/Core/test/test_DataDescriptorMatcherWorkflow.cxx b/Framework/Core/test/test_DataDescriptorMatcherWorkflow.cxx index ef792afa4cc79..e8bac109985c4 100644 --- a/Framework/Core/test/test_DataDescriptorMatcherWorkflow.cxx +++ b/Framework/Core/test/test_DataDescriptorMatcherWorkflow.cxx @@ -21,7 +21,6 @@ #include "Framework/DataAllocator.h" // we need to add workflow options before including Framework/runDataProcessing -//void customize(std::vector& workflowOptions) //{ //} diff --git a/Framework/Core/test/test_DataOutputDirector.cxx b/Framework/Core/test/test_DataOutputDirector.cxx index c158c52932db4..1834dd0781897 100644 --- a/Framework/Core/test/test_DataOutputDirector.cxx +++ b/Framework/Core/test/test_DataOutputDirector.cxx @@ -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); @@ -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); @@ -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); diff --git a/Framework/Core/test/test_Parallel.cxx b/Framework/Core/test/test_Parallel.cxx index 6e8ebb2a2d1f0..4fe0c920426e2 100644 --- a/Framework/Core/test/test_Parallel.cxx +++ b/Framework/Core/test/test_Parallel.cxx @@ -19,7 +19,6 @@ #include - using namespace o2::framework; struct FakeCluster { diff --git a/Framework/Core/test/test_ParallelPipeline.cxx b/Framework/Core/test/test_ParallelPipeline.cxx index 47106855a8f74..b79ee3a73cd24 100644 --- a/Framework/Core/test/test_ParallelPipeline.cxx +++ b/Framework/Core/test/test_ParallelPipeline.cxx @@ -63,7 +63,6 @@ std::vector defineDataProcessing(ConfigContext const&) LOG(debug) << "instance " << parallelContext.index1D() << " of " << parallelContext.index1DSize() << ": " << *input.spec << ": " << *((int*)input.payload); auto const* dataheader = DataRefUtils::getHeader(input); - //auto& data = ctx.outputs().make(OutputRef{"output", dataheader->subSpecification}); auto& data = ctx.outputs().make(Output{"TST", "PREPROC", dataheader->subSpecification}); ASSERT_ERROR(ctx.inputs().get(input.spec->binding.c_str()) == parallelContext.index1D()); data = parallelContext.index1D(); @@ -84,10 +83,8 @@ std::vector defineDataProcessing(ConfigContext const&) auto const* dataheader = DataRefUtils::getHeader(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(OutputRef{"output", dataheader->subSpecification}); auto& data = ctx.outputs().make(Output{"TST", "DATA", dataheader->subSpecification}); data = ctx.inputs().get(input.spec->binding.c_str()); - //auto& meta = ctx.outputs().make(OutputRef{"metadt", dataheader->subSpecification}); auto& meta = ctx.outputs().make(Output{"TST", "META", dataheader->subSpecification}); meta = dataheader->subSpecification; } diff --git a/Framework/Core/test/test_Root2ArrowTable.cxx b/Framework/Core/test/test_Root2ArrowTable.cxx index b22432d8565a5..a3f48957d7044 100644 --- a/Framework/Core/test/test_Root2ArrowTable.cxx +++ b/Framework/Core/test/test_Root2ArrowTable.cxx @@ -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; @@ -92,16 +91,12 @@ TEST_CASE("RootTree2Table") REQUIRE(array->length() == 3000); const float* c = reinterpret_cast(array->values()->data()); - //auto array = std::static_pointer_cast(table->column(0)->chunk(0)); - //CHECK_EQUAL(array->byte_width(), sizeof(float[3])); - //const float* c = reinterpret_cast(array->Value(0)); CHECK(c[0] == 1); CHECK(c[1] == 2); CHECK(c[2] == 1); } { - //auto values = std::static_pointer_cast(table->column(1)->chunk(0)); auto chunkToUse = table->column(1)->chunk(0); chunkToUse = std::dynamic_pointer_cast(chunkToUse)->values(); auto array = std::static_pointer_cast(chunkToUse); diff --git a/Framework/Core/test/test_StaticFor.cxx b/Framework/Core/test/test_StaticFor.cxx index bacdcaeefe86e..ee66c5b4aaf5b 100644 --- a/Framework/Core/test/test_StaticFor.cxx +++ b/Framework/Core/test/test_StaticFor.cxx @@ -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]); diff --git a/Framework/Core/test/test_VariablePayloadSequenceWorkflow.cxx b/Framework/Core/test/test_VariablePayloadSequenceWorkflow.cxx index 1024df1218485..9945eab037780 100644 --- a/Framework/Core/test/test_VariablePayloadSequenceWorkflow.cxx +++ b/Framework/Core/test/test_VariablePayloadSequenceWorkflow.cxx @@ -217,7 +217,6 @@ std::vector defineDataProcessing(ConfigContext const& config) ASSERT_ERROR(*reinterpret_cast(ref.payload) == sd->initialValue + nSequencePayloads); ++nSequencePayloads; } - //LOG(info) << "input " << ref.spec->binding << " has data {" << dh->dataOrigin.as() << "/" << dh->dataDescription.as() << "/" << dh->subSpecification << "}: " << *reinterpret_cast(ref.payload); } for (auto const& [channel, count] : active) { ++counters[channel];