From 31822c6b5f580f380ea5a226d94239d0aaf03135 Mon Sep 17 00:00:00 2001
From: Juraj Smiesko <34742917+kjvbrt@users.noreply.github.com>
Date: Tue, 24 Oct 2023 16:26:32 +0200
Subject: [PATCH] Use k4DataSvc instead of FCCDataSvc (#46)

---
 .../options/geant_fullsim_ecalSimple_singleparticles.py     | 4 ++--
 .../tests/options/geant_fullsim_hcal_singleparticles.py     | 4 ++--
 ...rrelCaloSystem_ReconstructionTopoClusters_electrNoise.py | 4 ++--
 ..._ReconstructionTopoClusters_electrNoise_coneSelection.py | 4 ++--
 ...uctionTopoClusters_electrNoise_fullGran_coneSelection.py | 4 ++--
 ...unBarrelCaloSystem_ReconstructionTopoClusters_noNoise.py | 4 ++--
 .../options/runEcalSimple_ReconstructionSW_noiseFromFile.py | 4 ++--
 .../runFullCaloSystem_CorrectECalBarrelSliWinClusters.py    | 4 ++--
 .../options/runFullCaloSystem_ReconstructionSW_noNoise.py   | 4 ++--
 .../runFullCaloSystem_ReconstructionSW_noiseFromFile.py     | 6 +++---
 ...llCaloSystem_ReconstructionSW_noiseFromFile_resegHCal.py | 4 ++--
 .../tests/options/runFullCaloSystem_SimAndDigitisation.py   | 4 ++--
 .../runFullCaloSystem_SimAndDigitisation_resegHCal.py       | 4 ++--
 .../tests/options/runHcalDigitisationFlatNoise.py           | 4 ++--
 .../tests/options/runHcalDigitisationWithoutNoise.py        | 4 ++--
 RecCalorimeter/tests/options/runPreparePileup.py            | 4 ++--
 RecFCCeeCalorimeter/tests/options/reproduceSegfault.py      | 4 ++--
 RecFCCeeCalorimeter/tests/options/runCaloSim.py             | 4 ++--
 .../runFullCaloSystem_ReconstructionSW_noiseFromFile.py     | 4 ++--
 .../tests/options/recoPositions_fullCaloSystem.py           | 4 ++--
 20 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/RecCalorimeter/tests/options/geant_fullsim_ecalSimple_singleparticles.py b/RecCalorimeter/tests/options/geant_fullsim_ecalSimple_singleparticles.py
index 3ca5966d..84d32be8 100644
--- a/RecCalorimeter/tests/options/geant_fullsim_ecalSimple_singleparticles.py
+++ b/RecCalorimeter/tests/options/geant_fullsim_ecalSimple_singleparticles.py
@@ -6,8 +6,8 @@
 from Gaudi.Configuration import *
 
 # Data service
-from Configurables import FCCDataSvc
-podioevent = FCCDataSvc("EventDataSvc")
+from Configurables import k4DataSvc
+podioevent = k4DataSvc("EventDataSvc")
 
 # DD4hep geometry service
 from Configurables import GeoSvc
diff --git a/RecCalorimeter/tests/options/geant_fullsim_hcal_singleparticles.py b/RecCalorimeter/tests/options/geant_fullsim_hcal_singleparticles.py
index cc3291bd..732e38cf 100644
--- a/RecCalorimeter/tests/options/geant_fullsim_hcal_singleparticles.py
+++ b/RecCalorimeter/tests/options/geant_fullsim_hcal_singleparticles.py
@@ -6,8 +6,8 @@
 from Gaudi.Configuration import *
 
 # Data service
-from Configurables import FCCDataSvc
-podioevent = FCCDataSvc("EventDataSvc")
+from Configurables import k4DataSvc
+podioevent = k4DataSvc("EventDataSvc")
 
 # DD4hep geometry service
 from Configurables import GeoSvc
diff --git a/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise.py b/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise.py
index 9ae64975..87ed1d41 100644
--- a/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise.py
+++ b/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise.py
@@ -27,8 +27,8 @@
 hcalFieldValues = [8]
 
 from Gaudi.Configuration import *
-from Configurables import ApplicationMgr,FCCDataSvc,PodioOutput
-podioevent = FCCDataSvc("EventDataSvc", input = "output_fullCalo_SimAndDigi_e50GeV_" +str(num_events) + "events.root")
+from Configurables import ApplicationMgr,k4DataSvc,PodioOutput
+podioevent = k4DataSvc("EventDataSvc", input = "output_fullCalo_SimAndDigi_e50GeV_" +str(num_events) + "events.root")
 
 #reads HepMC text file and write the HepMC::GenEvent to the data service
 from Configurables import PodioInput 
diff --git a/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_coneSelection.py b/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_coneSelection.py
index 79d0e48a..541e6459 100644
--- a/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_coneSelection.py
+++ b/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_coneSelection.py
@@ -27,8 +27,8 @@
 hcalFieldValues = [8]
 
 from Gaudi.Configuration import *
-from Configurables import ApplicationMgr,FCCDataSvc,PodioOutput
-podioevent = FCCDataSvc("EventDataSvc", input = "output_fullCalo_SimAndDigi_e50GeV_" +str(num_events) + "events.root")
+from Configurables import ApplicationMgr,k4DataSvc,PodioOutput
+podioevent = k4DataSvc("EventDataSvc", input = "output_fullCalo_SimAndDigi_e50GeV_" +str(num_events) + "events.root")
 
 #reads HepMC text file and write the HepMC::GenEvent to the data service
 from Configurables import PodioInput 
diff --git a/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_fullGran_coneSelection.py b/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_fullGran_coneSelection.py
index 973ad567..b59f20a1 100644
--- a/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_fullGran_coneSelection.py
+++ b/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_electrNoise_fullGran_coneSelection.py
@@ -27,8 +27,8 @@
 hcalFieldValues = [8]
 
 from Gaudi.Configuration import *
-from Configurables import ApplicationMgr,FCCDataSvc,PodioOutput
-podioevent = FCCDataSvc("EventDataSvc", input = "output_fullCalo_SimAndDigi_e50GeV_" +str(num_events) + "events.root")
+from Configurables import ApplicationMgr,k4DataSvc,PodioOutput
+podioevent = k4DataSvc("EventDataSvc", input = "output_fullCalo_SimAndDigi_e50GeV_" +str(num_events) + "events.root")
 
 #reads HepMC text file and write the HepMC::GenEvent to the data service
 from Configurables import PodioInput 
diff --git a/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_noNoise.py b/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_noNoise.py
index e0a615b7..3de7e5ea 100644
--- a/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_noNoise.py
+++ b/RecCalorimeter/tests/options/runBarrelCaloSystem_ReconstructionTopoClusters_noNoise.py
@@ -16,8 +16,8 @@
 num_events = 3
 
 from Gaudi.Configuration import *
-from Configurables import ApplicationMgr,FCCDataSvc,PodioOutput
-podioevent = FCCDataSvc("EventDataSvc", input = "output_fullCalo_SimAndDigi_e50GeV_" +
+from Configurables import ApplicationMgr,k4DataSvc,PodioOutput
+podioevent = k4DataSvc("EventDataSvc", input = "output_fullCalo_SimAndDigi_e50GeV_" +
                         str(num_events) + "events.root")
 
 #reads HepMC text file and write the HepMC::GenEvent to the data service
diff --git a/RecCalorimeter/tests/options/runEcalSimple_ReconstructionSW_noiseFromFile.py b/RecCalorimeter/tests/options/runEcalSimple_ReconstructionSW_noiseFromFile.py
index 214ff62b..e7df284a 100644
--- a/RecCalorimeter/tests/options/runEcalSimple_ReconstructionSW_noiseFromFile.py
+++ b/RecCalorimeter/tests/options/runEcalSimple_ReconstructionSW_noiseFromFile.py
@@ -1,8 +1,8 @@
 from Gaudi.Configuration import *
 
-from Configurables import ApplicationMgr, FCCDataSvc, PodioOutput
+from Configurables import ApplicationMgr, k4DataSvc, PodioOutput
 
-podioevent = FCCDataSvc("EventDataSvc", input="output_ecalSim_e50GeV_1events.root")
+podioevent = k4DataSvc("EventDataSvc", input="output_ecalSim_e50GeV_1events.root")
 
 # reads HepMC text file and write the HepMC::GenEvent to the data service
 from Configurables import PodioInput
diff --git a/RecCalorimeter/tests/options/runFullCaloSystem_CorrectECalBarrelSliWinClusters.py b/RecCalorimeter/tests/options/runFullCaloSystem_CorrectECalBarrelSliWinClusters.py
index e3ed924c..12fb0333 100644
--- a/RecCalorimeter/tests/options/runFullCaloSystem_CorrectECalBarrelSliWinClusters.py
+++ b/RecCalorimeter/tests/options/runFullCaloSystem_CorrectECalBarrelSliWinClusters.py
@@ -21,9 +21,9 @@
 num_events = 3
 
 from Gaudi.Configuration import *
-from Configurables import ApplicationMgr, FCCDataSvc, PodioOutput
+from Configurables import ApplicationMgr, k4DataSvc, PodioOutput
 
-podioevent = FCCDataSvc("EventDataSvc", input="output_allCalo_reco.root")
+podioevent = k4DataSvc("EventDataSvc", input="output_allCalo_reco.root")
 # reads HepMC text file and write the HepMC::GenEvent to the data service
 from Configurables import PodioInput
 podioinput = PodioInput("PodioReader",
diff --git a/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noNoise.py b/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noNoise.py
index eb12ed21..c62b9aac 100644
--- a/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noNoise.py
+++ b/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noNoise.py
@@ -21,9 +21,9 @@
 num_events = 3
 
 from Gaudi.Configuration import *
-from Configurables import ApplicationMgr, FCCDataSvc, PodioOutput
+from Configurables import ApplicationMgr, k4DataSvc, PodioOutput
 
-podioevent = FCCDataSvc("EventDataSvc", input="output_fullCalo_SimAndDigi_e50GeV_"+str(num_events)+"events.root")
+podioevent = k4DataSvc("EventDataSvc", input="output_fullCalo_SimAndDigi_e50GeV_"+str(num_events)+"events.root")
 # reads HepMC text file and write the HepMC::GenEvent to the data service
 from Configurables import PodioInput
 podioinput = PodioInput("PodioReader", 
diff --git a/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py b/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py
index 4dd84065..1797985e 100644
--- a/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py
+++ b/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py
@@ -28,15 +28,15 @@
 hcalFwdReadoutName = "HFwdPhiEta"
 
 from Gaudi.Configuration import *
-from Configurables import ApplicationMgr, FCCDataSvc, PodioOutput
+from Configurables import ApplicationMgr, k4DataSvc, PodioOutput
 
 num_events = 3
 ApplicationMgr().EvtSel = 'NONE'
 ApplicationMgr().EvtMax = num_events
 ApplicationMgr().OutputLevel = DEBUG
 
-from Configurables import FCCDataSvc
-podioevent = FCCDataSvc("EventDataSvc")
+from Configurables import k4DataSvc
+podioevent = k4DataSvc("EventDataSvc")
 # produced with Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_SimAndDigitisation.py
 podioevent.input="http://fccsw.web.cern.ch/fccsw/testsamples/output_fullCalo_SimAndDigi_e50GeV_3events.root"
 ApplicationMgr().ExtSvc += [podioevent]
diff --git a/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile_resegHCal.py b/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile_resegHCal.py
index 3f89d448..6df3d4ce 100644
--- a/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile_resegHCal.py
+++ b/RecCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile_resegHCal.py
@@ -21,9 +21,9 @@
 num_events = 3
 
 from Gaudi.Configuration import *
-from Configurables import ApplicationMgr, FCCDataSvc, PodioOutput
+from Configurables import ApplicationMgr, k4DataSvc, PodioOutput
 
-podioevent = FCCDataSvc("EventDataSvc", input="output_fullCalo_SimAndDigi_pi50GeV_"+str(num_events)+"events.root")
+podioevent = k4DataSvc("EventDataSvc", input="output_fullCalo_SimAndDigi_pi50GeV_"+str(num_events)+"events.root")
 # reads HepMC text file and write the HepMC::GenEvent to the data service
 from Configurables import PodioInput
 podioinput = PodioInput("PodioReader",
diff --git a/RecCalorimeter/tests/options/runFullCaloSystem_SimAndDigitisation.py b/RecCalorimeter/tests/options/runFullCaloSystem_SimAndDigitisation.py
index 9350b7c5..8cdf1185 100644
--- a/RecCalorimeter/tests/options/runFullCaloSystem_SimAndDigitisation.py
+++ b/RecCalorimeter/tests/options/runFullCaloSystem_SimAndDigitisation.py
@@ -11,8 +11,8 @@
 from Gaudi.Configuration import *
 
 
-from Configurables import FCCDataSvc
-podioevent   = FCCDataSvc("EventDataSvc")
+from Configurables import k4DataSvc
+podioevent   = k4DataSvc("EventDataSvc")
 
 
 ############################################### Particle Gun setup
diff --git a/RecCalorimeter/tests/options/runFullCaloSystem_SimAndDigitisation_resegHCal.py b/RecCalorimeter/tests/options/runFullCaloSystem_SimAndDigitisation_resegHCal.py
index 27a6558e..fd1a182d 100644
--- a/RecCalorimeter/tests/options/runFullCaloSystem_SimAndDigitisation_resegHCal.py
+++ b/RecCalorimeter/tests/options/runFullCaloSystem_SimAndDigitisation_resegHCal.py
@@ -10,9 +10,9 @@
 
 from Gaudi.Configuration import *
 
-from Configurables import ApplicationMgr, FCCDataSvc, PodioOutput
+from Configurables import ApplicationMgr, k4DataSvc, PodioOutput
 
-podioevent   = FCCDataSvc("EventDataSvc")
+podioevent   = k4DataSvc("EventDataSvc")
 
 from Configurables import GeoSvc
 geoservice = GeoSvc("GeoSvc", detectors=[  'file:Detector/DetFCChhBaseline1/compact/FCChh_DectEmptyMaster.xml',
diff --git a/RecCalorimeter/tests/options/runHcalDigitisationFlatNoise.py b/RecCalorimeter/tests/options/runHcalDigitisationFlatNoise.py
index 64efbe79..be1d75f8 100644
--- a/RecCalorimeter/tests/options/runHcalDigitisationFlatNoise.py
+++ b/RecCalorimeter/tests/options/runHcalDigitisationFlatNoise.py
@@ -1,8 +1,8 @@
 from Gaudi.Configuration import *
 
-from Configurables import ApplicationMgr, FCCDataSvc, PodioOutput
+from Configurables import ApplicationMgr, k4DataSvc, PodioOutput
 
-podioevent   = FCCDataSvc("EventDataSvc", input="output_hcalSim_e50GeV_eta036_10events.root")
+podioevent   = k4DataSvc("EventDataSvc", input="output_hcalSim_e50GeV_eta036_10events.root")
 
 # reads HepMC text file and write the HepMC::GenEvent to the data service
 from Configurables import PodioInput
diff --git a/RecCalorimeter/tests/options/runHcalDigitisationWithoutNoise.py b/RecCalorimeter/tests/options/runHcalDigitisationWithoutNoise.py
index 7ade4f22..71e09cc4 100644
--- a/RecCalorimeter/tests/options/runHcalDigitisationWithoutNoise.py
+++ b/RecCalorimeter/tests/options/runHcalDigitisationWithoutNoise.py
@@ -1,8 +1,8 @@
 from Gaudi.Configuration import *
 
-from Configurables import ApplicationMgr, FCCDataSvc, PodioOutput
+from Configurables import ApplicationMgr, k4DataSvc, PodioOutput
 
-podioevent   = FCCDataSvc("EventDataSvc", input="output_hcalSim_e50GeV_eta036_10events.root")
+podioevent   = k4DataSvc("EventDataSvc", input="output_hcalSim_e50GeV_eta036_10events.root")
 
 # reads HepMC text file and write the HepMC::GenEvent to the data service
 from Configurables import PodioInput
diff --git a/RecCalorimeter/tests/options/runPreparePileup.py b/RecCalorimeter/tests/options/runPreparePileup.py
index 2acd011a..b5f9425d 100644
--- a/RecCalorimeter/tests/options/runPreparePileup.py
+++ b/RecCalorimeter/tests/options/runPreparePileup.py
@@ -1,9 +1,9 @@
 from Gaudi.Configuration import *
 
-from Configurables import ApplicationMgr, FCCDataSvc, PodioOutput
+from Configurables import ApplicationMgr, k4DataSvc, PodioOutput
 
 # v01 production - min. bias events
-podioevent = FCCDataSvc("EventDataSvc", input="http://fccsw.web.cern.ch/fccsw/testsamples/caloCells_minBiasEvent.root")
+podioevent = k4DataSvc("EventDataSvc", input="http://fccsw.web.cern.ch/fccsw/testsamples/caloCells_minBiasEvent.root")
 
 # reads HepMC text file and write the HepMC::GenEvent to the data service
 from Configurables import PodioInput
diff --git a/RecFCCeeCalorimeter/tests/options/reproduceSegfault.py b/RecFCCeeCalorimeter/tests/options/reproduceSegfault.py
index 7cf93d3c..68966850 100644
--- a/RecFCCeeCalorimeter/tests/options/reproduceSegfault.py
+++ b/RecFCCeeCalorimeter/tests/options/reproduceSegfault.py
@@ -20,8 +20,8 @@
 
 from Gaudi.Configuration import *
 
-from Configurables import FCCDataSvc
-podioevent  = FCCDataSvc("EventDataSvc")
+from Configurables import k4DataSvc
+podioevent  = k4DataSvc("EventDataSvc")
 
 ################## Particle gun setup
 _pi = 3.14159
diff --git a/RecFCCeeCalorimeter/tests/options/runCaloSim.py b/RecFCCeeCalorimeter/tests/options/runCaloSim.py
index c04f36e0..ddade20d 100644
--- a/RecFCCeeCalorimeter/tests/options/runCaloSim.py
+++ b/RecFCCeeCalorimeter/tests/options/runCaloSim.py
@@ -11,9 +11,9 @@
 ApplicationMgr().StopOnSignal = True
 ApplicationMgr().ExtSvc += ['RndmGenSvc']
 
-from Configurables import FCCDataSvc
+from Configurables import k4DataSvc
 ## Data service
-podioevent = FCCDataSvc("EventDataSvc")
+podioevent = k4DataSvc("EventDataSvc")
 ApplicationMgr().ExtSvc += [podioevent]
 
 from Configurables import MomentumRangeParticleGun
diff --git a/RecFCCeeCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py b/RecFCCeeCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py
index df448cd9..d5d513b2 100644
--- a/RecFCCeeCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py
+++ b/RecFCCeeCalorimeter/tests/options/runFullCaloSystem_ReconstructionSW_noiseFromFile.py
@@ -7,10 +7,10 @@
 
 
 from Gaudi.Configuration import *
-from Configurables import ApplicationMgr, FCCDataSvc, PodioOutput
+from Configurables import ApplicationMgr, k4DataSvc, PodioOutput
 import sys
 
-podioevent = FCCDataSvc("EventDataSvc")
+podioevent = k4DataSvc("EventDataSvc")
 podioevent.input = "output_fullCalo_SimAndDigi.root"
 # reads HepMC text file and write the HepMC::GenEvent to the data service
 from Configurables import PodioInput
diff --git a/RecFCChhCalorimeter/tests/options/recoPositions_fullCaloSystem.py b/RecFCChhCalorimeter/tests/options/recoPositions_fullCaloSystem.py
index b0f861b9..5195ff89 100644
--- a/RecFCChhCalorimeter/tests/options/recoPositions_fullCaloSystem.py
+++ b/RecFCChhCalorimeter/tests/options/recoPositions_fullCaloSystem.py
@@ -1,6 +1,6 @@
 from Gaudi.Configuration import *
 
-from Configurables import ApplicationMgr, FCCDataSvc, PodioOutput
+from Configurables import ApplicationMgr, k4DataSvc, PodioOutput
 
 # ECAL readouts
 ecalBarrelReadoutName = "ECalBarrelEta"
@@ -15,7 +15,7 @@
 # Number of events
 num_events = 3
 
-podioevent = FCCDataSvc("EventDataSvc", input="output_fullCalo_SimAndDigi_e50GeV_"+str(num_events)+"events.root")
+podioevent = k4DataSvc("EventDataSvc", input="output_fullCalo_SimAndDigi_e50GeV_"+str(num_events)+"events.root")
 
 # reads HepMC text file and write the HepMC::GenEvent to the data service
 from Configurables import PodioInput