added tests

HEP-FCC · Mar 13, 2018 · 4b23b84 · 4b23b84
1 parent 89f0709
commit 4b23b84
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
@@ -47,6 +47,9 @@ gaudi_add_test(ReadFullSimTrackerHits
 gaudi_add_test(GeantFullSimParticleGun
                WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
                FRAMEWORK options/geant_pgun_fullsim.py)
+gaudi_add_test(GeantFullSimMinBias
+               WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+               FRAMEWORK options/min_bias_pool.py)
 gaudi_add_test(GeantFastSimTrackerECalGFlash
                WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
                FRAMEWORK options/geant_fastsim.py)

diff --git a/Examples/options/min_bias_pool.py b/Examples/options/min_bias_pool.py
@@ -59,7 +59,7 @@
 field = SimG4ConstantMagneticFieldTool("SimG4ConstantMagneticFieldTool", FieldOn=True, IntegratorStepper="ClassicalRK4")
 
 from Configurables import SimG4Alg, SimG4SaveCalHits
-saveecaltool = SimG4SaveCalHits("saveECalHits",readoutNames = ["ECalHitsPhiEta"])
+saveecaltool = SimG4SaveCalHits("saveECalHits",readoutNames = ["ECalBarrelEta"])
 saveecaltool.positionedCaloHits.Path = "ECalPositionedHits"
 saveecaltool.caloHits.Path = "ECalHits"
 

diff --git a/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_SimAndDigitisation.py b/Reconstruction/RecCalorimeter/tests/options/runFullCaloSystem_SimAndDigitisation.py
@@ -54,8 +54,6 @@
 extHcalReadoutName = "HCalExtBarrelReadout"
 hcalEndcapReadoutName = "HECPhiEta"
 hcalFwdReadoutName = "HFwdPhiEta"
-# Tail Catcher readout
-tailCatcherReadoutName = "Muons_Readout"
 # layers to be merged in endcaps & forward calo
 ecalEndcapNumberOfLayersToMerge = [26]*5+[27]
 ecalFwdNumberOfLayersToMerge = [7]*5+[8]

diff --git a/Sim/SimG4Components/CMakeLists.txt b/Sim/SimG4Components/CMakeLists.txt
@@ -24,6 +24,9 @@ include(CTest)
 gaudi_add_test(GeantFullSimGdml
                WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
                FRAMEWORK tests/options/geant_fullsim_gdml.py)
+gaudi_add_test(GeantFullSimHCal
+               WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+               FRAMEWORK tests/options/geant_fullsim_hcal.py)
 gaudi_add_test(GeantFullSimMoreEvents
                WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/Sim/SimG4Components/tests/
                FRAMEWORK tests/options/geant_fullsim_moreEvents.py)

diff --git a/Sim/SimG4Components/tests/options/geant_fullsim_hcal.py b/Sim/SimG4Components/tests/options/geant_fullsim_hcal.py
@@ -33,7 +33,7 @@
 # first, create a tool that saves the calorimeter hits (of type "hcal")
 # Name of that tool in GAUDI is "XX/YY" where XX is the tool class name ("SimG4SaveTrackerHits")
 # and YY is the given name ("saveTrackerHits")
-savehcaltool = SimG4SaveCalHits("saveHCalHits", readoutNames = ["BarHCal_Readout"])
+savehcaltool = SimG4SaveCalHits("saveHCalHits", readoutNames = ["HCalBarrelReadout"])
 savehcaltool.positionedCaloHits.Path = "positionedCaloHits"
 savehcaltool.caloHits.Path = "caloHits"
 # next, create the G4 algorithm, giving the list of names of tools ("XX/YY")