From d79d12508c3ed68a8cfa75db2662b250ea2d6d81 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Fri, 15 Mar 2024 08:55:49 +0100 Subject: [PATCH] Don't change the functionals to avoid rebase conflicts in #173 --- .../options/TestDataHandleUniquePtr.py | 43 -------------- .../components/ExampleFunctionalConsumer.cpp | 2 +- .../ExampleFunctionalConsumerMultiple.cpp | 2 +- .../components/ExampleFunctionalProducer.cpp | 2 +- .../ExampleFunctionalProducerMultiple.cpp | 2 +- .../ExampleFunctionalTransformer.cpp | 2 +- .../ExampleFunctionalTransformerMultiple.cpp | 2 +- .../components/TestDataHandleUniquePtr.cpp | 56 ------------------- 8 files changed, 6 insertions(+), 105 deletions(-) delete mode 100644 test/k4FWCoreTest/options/TestDataHandleUniquePtr.py delete mode 100644 test/k4FWCoreTest/src/components/TestDataHandleUniquePtr.cpp diff --git a/test/k4FWCoreTest/options/TestDataHandleUniquePtr.py b/test/k4FWCoreTest/options/TestDataHandleUniquePtr.py deleted file mode 100644 index 20a64de2..00000000 --- a/test/k4FWCoreTest/options/TestDataHandleUniquePtr.py +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2014-2024 Key4hep-Project. -# -# This file is part of Key4hep. -# See https://key4hep.github.io/key4hep-doc/ for further info. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -from Gaudi.Configuration import * - -from Configurables import ApplicationMgr - -ApplicationMgr().EvtSel = "NONE" -ApplicationMgr().EvtMax = 100 -ApplicationMgr().OutputLevel = INFO -ApplicationMgr().StopOnSignal = True - -from Configurables import k4DataSvc - -podioevent = k4DataSvc("EventDataSvc") -ApplicationMgr().ExtSvc += [podioevent] - -from Configurables import TestDataHandleUniquePtr - -producer = TestDataHandleUniquePtr() -ApplicationMgr().TopAlg += [producer] - -from Configurables import PodioOutput - -out = PodioOutput("out") -out.filename = "output_TestDataHandleUniquePtr.root" -out.outputCommands = ["keep *"] -ApplicationMgr().TopAlg += [out] diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp index e4068049..1f5e9458 100644 --- a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp +++ b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp @@ -18,7 +18,7 @@ */ #include "Gaudi/Property.h" -#include "Gaudi/Functional/Consumer.h" +#include "GaudiAlg/Consumer.h" #include "edm4hep/MCParticleCollection.h" diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerMultiple.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerMultiple.cpp index 9a71f617..440d8f85 100644 --- a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerMultiple.cpp +++ b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerMultiple.cpp @@ -18,7 +18,7 @@ */ #include "Gaudi/Property.h" -#include "Gaudi/Functional/Consumer.h" +#include "GaudiAlg/Consumer.h" #include "edm4hep/MCParticleCollection.h" #include "edm4hep/SimTrackerHitCollection.h" diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp index 787b8911..fbd319b3 100644 --- a/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp +++ b/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp @@ -18,7 +18,7 @@ */ #include "Gaudi/Property.h" -#include "Gaudi/Functional/Producer.h" +#include "GaudiAlg/Producer.h" #include "k4FWCore/BaseClass.h" #include "edm4hep/MCParticleCollection.h" diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp index 0c0deb26..b8bcce0f 100644 --- a/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp +++ b/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp @@ -18,7 +18,7 @@ */ #include "Gaudi/Property.h" -#include "Gaudi/Functional/Producer.h" +#include "GaudiAlg/Producer.h" #include "k4FWCore/BaseClass.h" #include "edm4hep/MCParticleCollection.h" diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp index 03770cfc..0abe3c31 100644 --- a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp +++ b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp @@ -18,7 +18,7 @@ */ #include "Gaudi/Property.h" -#include "Gaudi/Functional/Transformer.h" +#include "GaudiAlg/Transformer.h" #include "edm4hep/MCParticleCollection.h" #include "edm4hep/MutableMCParticle.h" diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerMultiple.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerMultiple.cpp index 8dc7ca6d..e84587fa 100644 --- a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerMultiple.cpp +++ b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerMultiple.cpp @@ -18,7 +18,7 @@ */ #include "Gaudi/Property.h" -#include "Gaudi/Functional/Transformer.h" +#include "GaudiAlg/Transformer.h" #include "edm4hep/MCParticleCollection.h" #include "edm4hep/SimTrackerHitCollection.h" diff --git a/test/k4FWCoreTest/src/components/TestDataHandleUniquePtr.cpp b/test/k4FWCoreTest/src/components/TestDataHandleUniquePtr.cpp deleted file mode 100644 index 556384c9..00000000 --- a/test/k4FWCoreTest/src/components/TestDataHandleUniquePtr.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2014-2024 Key4hep-Project. - * - * This file is part of Key4hep. - * See https://key4hep.github.io/key4hep-doc/ for further info. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "TestDataHandleUniquePtr.h" - -// datamodel -#include "edm4hep/MCParticleCollection.h" - -DECLARE_COMPONENT(TestDataHandleUniquePtr) - -TestDataHandleUniquePtr::TestDataHandleUniquePtr(const std::string& aName, ISvcLocator* aSvcLoc) - : Gaudi::Algorithm(aName, aSvcLoc) { - declareProperty("mcparticles", m_mcParticleHandle, "Dummy Particle collection (output)"); -} - -TestDataHandleUniquePtr::~TestDataHandleUniquePtr() {} - -StatusCode TestDataHandleUniquePtr::initialize() { - if (Gaudi::Algorithm::initialize().isFailure()) { - return StatusCode::FAILURE; - } - return StatusCode::SUCCESS; -} - -StatusCode TestDataHandleUniquePtr::execute(const EventContext&) const { - auto coll = std::make_unique(); - - auto particle = coll->create(); - - auto& p4 = particle.getMomentum(); - p4.x = 5; - p4.y = 6; - p4.z = 7; - particle.setMass(8); - - m_mcParticleHandle.put(std::move(coll)); - - return StatusCode::SUCCESS; -} - -StatusCode TestDataHandleUniquePtr::finalize() { return Gaudi::Algorithm::finalize(); }