Merge pull request #10 from s6anloes/main

Added noise digitizer solution and updated test

Author: s6anloes

GaudiTutorial/RandomNoiseDigitizer/options/runRandomNoiseDigitizer.py

@@ -39,8 +39,8 @@
     OutputLevel=INFO
 )
 
-from Configurables import RandomNoiseDigitizerSolution
-random_noise_digitizer = RandomNoiseDigitizerSolution("RandomNoiseDigitizer",
+from Configurables import RandomNoiseDigitizer
+random_noise_digitizer = RandomNoiseDigitizer("RandomNoiseDigitizer",
                                 InputCaloSimHitCollection=["simplecaloRO"],
                                 OutputCaloDigiHitCollection=["CaloDigiHits"],
                                 uidSvcName="uidSvc",

GaudiTutorial/RandomNoiseDigitizer/options/runRandomNoiseDigitizerSolution.py

@@ -0,0 +1,58 @@
+#
+# Copyright (c) 2020-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 INFO
+from k4FWCore import IOSvc, ApplicationMgr
+from Configurables import EventDataSvc, UniqueIDGenSvc, ChronoAuditor, AuditorSvc
+
+chra = ChronoAuditor()
+audsvc = AuditorSvc()
+audsvc.Auditors = [chra]
+
+io_svc = IOSvc("IOSvc")
+io_svc.Input = "../../data/simpleCalo_simulation.root"
+io_svc.Output = "../../data/simpleCalo_noiseDigitizer.root"
+
+from Configurables import EventStats
+
+eventStats_functional = EventStats("EventStats",
+
+    InputCaloHitCollection=["simplecaloRO"],
+    OutputEnergyBarycentre=["EnergyBarycentreX", "EnergyBarycentreY", "EnergyBarycentreZ"],
+    OutputTotalEnergy=["TotalEnergy"],
+    SaveHistograms=True,
+    OutputLevel=INFO
+)
+
+from Configurables import RandomNoiseDigitizerSolution
+random_noise_digitizer = RandomNoiseDigitizerSolution("RandomNoiseDigitizer",
+                                InputCaloSimHitCollection=["simplecaloRO"],
+                                OutputCaloDigiHitCollection=["CaloDigiHits"],
+                                uidSvcName="uidSvc",
+                                NoiseMean=1e-3,
+                                NoiseWidth=1e-4,
+                                OutputLevel=INFO
+                                )
+
+app_mgr = ApplicationMgr(
+    TopAlg=[eventStats_functional, random_noise_digitizer],
+    EvtSel='NONE',
+    EvtMax=-1,
+    ExtSvc=[EventDataSvc("EventDataSvc"), UniqueIDGenSvc("uidSvc"), audsvc],
+    StopOnSignal=True,
+)

test/CMakeLists.txt

@@ -48,7 +48,7 @@ set_test_env(test_MoliereRadius)
 
 add_test(NAME test_RandomNoiseDigitizer
                WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-               COMMAND k4run GaudiTutorial/RandomNoiseDigitizer/options/runRandomNoiseDigitizer.py --IOSvc.Input ${PROJECT_SOURCE_DIR}/GaudiTutorial/data/simpleCalo_simulation.root --IOSvc.Output ${PROJECT_SOURCE_DIR}/GaudiTutorial/data/simpleCalo_noiseDigitizer.root)
+               COMMAND k4run GaudiTutorial/RandomNoiseDigitizer/options/runRandomNoiseDigitizerSolution.py --IOSvc.Input ${PROJECT_SOURCE_DIR}/GaudiTutorial/data/simpleCalo_simulation.root --IOSvc.Output ${PROJECT_SOURCE_DIR}/GaudiTutorial/data/simpleCalo_noiseDigitizer.root)
 set_test_env(test_MoliereRadius)
 
 # For LD_LIBRARY_PATH