Don't link to GaudiAlg, update to the functional algorithms and IOSvc

key4hep · Aug 2, 2024 · 121e7df · 121e7df
1 parent b6568a2
commit 121e7df
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 60 deletions.
diff --git a/k4ProjectTemplate/CMakeLists.txt b/k4ProjectTemplate/CMakeLists.txt
@@ -21,7 +21,6 @@ file(GLOB _plugin_sources src/components/*.cpp)
 gaudi_add_module(k4ProjectTemplatePlugins
                  SOURCES ${_plugin_sources}
                  LINK Gaudi::GaudiKernel
-                      Gaudi::GaudiAlgLib
                       k4FWCore::k4FWCore
                       EDM4HEP::edm4hep
                       )

diff --git a/k4ProjectTemplate/options/createExampleEventData.py b/k4ProjectTemplate/options/createExampleEventData.py
@@ -18,21 +18,17 @@
 #
 from Gaudi.Configuration import INFO
 from Configurables import CreateExampleEventData
-from Configurables import PodioOutput
-from Configurables import ApplicationMgr
-from Configurables import k4DataSvc
+from k4FWCore import ApplicationMgr, IOSvc
 
-podioevent = k4DataSvc("EventDataSvc")
+iosvc = IOSvc()
+iosvc.Output = "output_k4test_exampledata.root"
+iosvc.outputCommands = ["keep *"]
 
 producer = CreateExampleEventData()
 
-out = PodioOutput("out")
-out.filename = "output_k4test_exampledata.root"
-out.outputCommands = ["keep *"]
-
-ApplicationMgr(TopAlg=[producer, out],
+ApplicationMgr(TopAlg=[producer],
                EvtSel="NONE",
                EvtMax=100,
-               ExtSvc=[podioevent],
+               ExtSvc=[iosvc],
                OutputLevel=INFO,
                )
diff --git a/k4ProjectTemplate/options/createHelloWorld.py b/k4ProjectTemplate/options/createHelloWorld.py
@@ -16,16 +16,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from Gaudi.Configuration import *
-
+from Gaudi.Configuration import INFO
 from Configurables import HelloWorldAlg
+from k4FWCore import ApplicationMgr
+
 producer = HelloWorldAlg()
 producer.PerEventPrintMessage = "Hello World !"
 
-from Configurables import ApplicationMgr
-ApplicationMgr( TopAlg=[producer],
-                EvtSel="NONE",
-                EvtMax=1,
-                OutputLevel=INFO,
-                )
-
+ApplicationMgr(TopAlg=[producer],
+               EvtSel="NONE",
+               EvtMax=1,
+               OutputLevel=INFO,
+               )
diff --git a/k4ProjectTemplate/options/readExampleEventData.py b/k4ProjectTemplate/options/readExampleEventData.py
@@ -17,23 +17,17 @@
 # limitations under the License.
 #
 from Gaudi.Configuration import DEBUG
-from Configurables import k4DataSvc
-from Configurables import CreateExampleEventData
-from Configurables import PodioInput
-from Configurables import ApplicationMgr
+from k4FWCore import ApplicationMgr
+from k4FWCore import IOSvc
 
-podioevent = k4DataSvc("EventDataSvc")
-podioevent.input = "output_k4test_exampledata.root"
-producer = CreateExampleEventData()
-
-inp = PodioInput("InputReader")
-inp.collections = ["ExampleParticles"]
-
-ApplicationMgr( TopAlg=[inp],
-                EvtSel="NONE",
-                EvtMax=100,
-                ExtSvc=[podioevent],
-                OutputLevel=DEBUG,
-                )
+iosvc = IOSvc("IOSvc")
+iosvc.input = "output_k4test_exampledata.root"
 
+iosvc.CollectionNames = ["ExampleParticles"]
 
+ApplicationMgr(TopAlg=[],
+               EvtSel="NONE",
+               EvtMax=100,
+               ExtSvc=[iosvc],
+               OutputLevel=DEBUG,
+               )
diff --git a/k4ProjectTemplate/src/components/CreateExampleEventData.cpp b/k4ProjectTemplate/src/components/CreateExampleEventData.cpp
@@ -18,18 +18,15 @@
  */
 
 #include "Gaudi/Property.h"
-#include "GaudiAlg/Producer.h"
-
-// Define BaseClass_t
-#include "k4FWCore/BaseClass.h"
+#include "k4FWCore/Producer.h"
 
 #include "edm4hep/MCParticleCollection.h"
 
 #include <string>
 
-struct CreateExampleEventData final : Gaudi::Functional::Producer<edm4hep::MCParticleCollection(), BaseClass_t> {
+struct CreateExampleEventData final : k4FWCore::Producer<edm4hep::MCParticleCollection()> {
   CreateExampleEventData(const std::string& name, ISvcLocator* svcLoc)
-      : Producer(name, svcLoc, KeyValue("OutputLocation", "ExampleParticles")) {}
+    : Producer(name, svcLoc, {}, KeyValues("OutputLocation", {"ExampleParticles"})) {}
 
   edm4hep::MCParticleCollection operator()() const override {
     auto coll     = edm4hep::MCParticleCollection();

diff --git a/k4ProjectTemplate/src/components/ExampleConsumer.cpp b/k4ProjectTemplate/src/components/ExampleConsumer.cpp
@@ -17,19 +17,17 @@
  * limitations under the License.
  */
 
-#include "Gaudi/Property.h"
-#include "GaudiAlg/Consumer.h"
+#include "k4FWCore/Consumer.h"
 
-// Define BaseClass_t
-#include "k4FWCore/BaseClass.h"
+#include "edm4hep/MCParticleCollection.h"
 
 #include <string>
 
-struct ExampleConsumer final : Gaudi::Functional::Consumer<void(const int&), BaseClass_t> {
+struct ExampleConsumer final : k4FWCore::Consumer<void(const edm4hep::MCParticleCollection&)> {
   ExampleConsumer(const std::string& name, ISvcLocator* svcLoc)
-      : Consumer(name, svcLoc, KeyValue("ExampleConsumerInputLocation", "/ExampleInt")) {}
+    : Consumer(name, svcLoc, KeyValues("ExampleConsumerInputLocation", {"/ExampleInt"})) {}
 
-  void operator()(const int& input) const override { info() << "ExampleInt = " << input << endmsg; }
+  void operator()(const edm4hep::MCParticleCollection& input) const override { info() << input << endmsg; }
 };
 
 DECLARE_COMPONENT(ExampleConsumer)
diff --git a/k4ProjectTemplate/src/components/ExampleTransformer.cpp b/k4ProjectTemplate/src/components/ExampleTransformer.cpp
@@ -17,22 +17,20 @@
  * limitations under the License.
  */
 
-#include "Gaudi/Property.h"
-#include "GaudiAlg/Transformer.h"
+#include "k4FWCore/Transformer.h"
 
-// Define BaseClass_t
-#include "k4FWCore/BaseClass.h"
+#include "edm4hep/MCParticleCollection.h"
 
 #include <string>
 
-struct ExampleTransformer final : Gaudi::Functional::Transformer<int(const int&), BaseClass_t> {
+struct ExampleTransformer final : k4FWCore::Transformer<edm4hep::MCParticleCollection(const edm4hep::MCParticleCollection&)> {
   ExampleTransformer(const std::string& name, ISvcLocator* svcLoc)
-      : Transformer(name, svcLoc, KeyValue("ExampleTransformerInputLocation", "/InputExampleInt"),
-                    {KeyValue("ExampleTransformerOutputLocation", "/OutputExampleInt")}) {}
+    : Transformer(name, svcLoc, {KeyValues("ExampleTransformerInputLocation", {"/InputExampleInt"})},
+                  {KeyValues("ExampleTransformerOutputLocation", {"/OutputExampleInt"})}) {}
 
-  int operator()(const int& input) const override {
-    info() << "ExampleInt = " << input << endmsg;
-    return input + 1;
+  edm4hep::MCParticleCollection operator()(const edm4hep::MCParticleCollection& input) const override {
+    info() << input << endmsg;
+    return edm4hep::MCParticleCollection();
   }
 };