From 3065e72a60a90cfd3ad330b2aa3092ec0fe4dcdc Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Tue, 17 Jan 2023 17:23:25 +0100
Subject: [PATCH] Fix rebase error
---
DDDigi/io/DigiIO.h | 6 ------
examples/DDDigi/scripts/TestEdm4hepOutput.py | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/DDDigi/io/DigiIO.h b/DDDigi/io/DigiIO.h
index a8eff62e9..4ed77d2f3 100644
--- a/DDDigi/io/DigiIO.h
+++ b/DDDigi/io/DigiIO.h
@@ -75,12 +75,6 @@ namespace dd4hep {
template <typename FIRST, typename SECOND> static
void _to_edm4hep(const FIRST& first, SECOND& second, int hit_type);
- template <typename FIRST, typename SECOND> static
- void _to_edm4hep(const FIRST& first, SECOND& second, int hit_type);
-
- template <typename FIRST, typename SECOND, typename THIRD> static
- void _to_edm4hep(const FIRST& first, const SECOND& second, THIRD& third, int hit_type);
-
template <typename FIRST, typename SECOND, typename THIRD> static
void _to_edm4hep(const FIRST& first, const SECOND& second, THIRD& third, int hit_type);
diff --git a/examples/DDDigi/scripts/TestEdm4hepOutput.py b/examples/DDDigi/scripts/TestEdm4hepOutput.py
index 2b0fafcf4..7ce07999d 100644
--- a/examples/DDDigi/scripts/TestEdm4hepOutput.py
+++ b/examples/DDDigi/scripts/TestEdm4hepOutput.py
@@ -17,7 +17,7 @@ def run():
digi = DigiTest.Test(geometry=None)
read = digi.input_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()])
dump = digi.event_action('DigiStoreDump/StoreDump', parallel=False)
- writ = digi.output_action('Digi2edm4hepWriter/Writer',
+ writ = digi.output_action('Digi2edm4hepOutput/Writer',
parallel=True,
input_mask=0x0,
input_segment='input',
--
GitLab