From 4e480abbd43bf7adca83f747289ef3b5a38fc813 Mon Sep 17 00:00:00 2001 From: Juraj Smiesko Date: Thu, 22 Feb 2024 13:30:19 +0100 Subject: [PATCH] Adjusting test --- Examples/CMakeLists.txt | 2 +- Examples/options/geant_fastsim.py | 1 + Examples/options/geant_fastsim_tklayout.py | 2 ++ Examples/options/geant_fullsim.py | 13 +++++++--- .../geant_fullsim_fccee_idea_hepevt.py | 21 ++++++++-------- .../options/geant_fullsim_fccee_idea_pgun.py | 2 ++ .../options/geant_fullsim_fccee_lar_pgun.py | 6 ++--- Examples/options/geant_fullsim_fcchh_main.py | 5 ++-- .../options/geant_fullsim_fcchh_tracker.py | 9 ++++--- Examples/options/geant_fullsim_field.py | 13 +++++++--- Examples/options/geant_fullsim_userlimits.py | 2 ++ Examples/options/read_podio_input.py | 2 +- .../fccsw/detector_fcc_hh_main.py | 25 ++++++++++++------- .../fccsw/detector_fcc_hh_tracker.py | 17 +++++++++---- 14 files changed, 76 insertions(+), 44 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 6b2e41a11..14d06fa5b 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -1,6 +1,6 @@ -install(DIRECTORY options +install(DIRECTORY options DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/Examples PATTERN k4_workflow_blocks EXCLUDE ) diff --git a/Examples/options/geant_fastsim.py b/Examples/options/geant_fastsim.py index 81b07682f..38241118b 100644 --- a/Examples/options/geant_fastsim.py +++ b/Examples/options/geant_fastsim.py @@ -1,3 +1,4 @@ +import os from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units diff --git a/Examples/options/geant_fastsim_tklayout.py b/Examples/options/geant_fastsim_tklayout.py index d52894707..f680029f1 100644 --- a/Examples/options/geant_fastsim_tklayout.py +++ b/Examples/options/geant_fastsim_tklayout.py @@ -1,3 +1,5 @@ +import os + from Gaudi.Configuration import * from Configurables import ApplicationMgr diff --git a/Examples/options/geant_fullsim.py b/Examples/options/geant_fullsim.py index df76835fa..29068b06c 100644 --- a/Examples/options/geant_fullsim.py +++ b/Examples/options/geant_fullsim.py @@ -1,6 +1,6 @@ ### | read events from a HepMC file | convert `HepMC::GenEvent` to EDM | geometry taken from GDML file (no sensitive detectors!) | FTFP_BERT physics list | empty action initialisation list | write the EDM output to ROOT file using PODIO | - +import os from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units @@ -64,9 +64,14 @@ from Configurables import SimG4Alg geantsim = SimG4Alg("SimG4Alg") from Configurables import SimG4SaveTrackerHits -savetrackertool = SimG4SaveTrackerHits("saveTrackerHits") -savetrackertool.readoutNames = ["TrackerBarrelReadout", "TrackerEndcapReadout"] -geantsim.outputs = [savetrackertool] +savetrackerbarreltool = SimG4SaveTrackerHits("saveTrackerHitsBarrel") +savetrackerbarreltool.readoutName = "TrackerBarrelReadout" +savetrackerbarreltool.SimTrackHits.Path = "TrackerBarrelReadout" +geantsim.outputs = [savetrackerbarreltool] +savetrackerendcaptool = SimG4SaveTrackerHits("saveTrackerHitsEndcap") +savetrackerendcaptool.readoutName = "TrackerEndcapReadout" +savetrackerendcaptool.SimTrackHits.Path = "TrackerEndcapReadout" +geantsim.outputs += [savetrackerendcaptool] from Configurables import SimG4PrimariesFromEdmTool geantsim.eventProvider = SimG4PrimariesFromEdmTool("EdmConverter") geantsim.eventProvider.GenParticles.Path = "allGenParticles" diff --git a/Examples/options/geant_fullsim_fccee_idea_hepevt.py b/Examples/options/geant_fullsim_fccee_idea_hepevt.py index 5df450d5d..c7aa3798a 100644 --- a/Examples/options/geant_fullsim_fccee_idea_hepevt.py +++ b/Examples/options/geant_fullsim_fccee_idea_hepevt.py @@ -1,3 +1,5 @@ +import os + from Gaudi.Configuration import * import GaudiKernel.SystemOfUnits as units @@ -29,26 +31,27 @@ ApplicationMgr().ExtSvc += [geoservice] from Configurables import SimG4Alg -SimG4Alg("SimG4Alg").outputs += [] +geantsim = SimG4Alg("SimG4Alg") +geantsim.outputs = [] from Configurables import SimG4SaveTrackerHits savetrackertool = SimG4SaveTrackerHits("saveTrackerHits_Barrel") savetrackertool.readoutNames = ["VertexBarrelCollection"] savetrackertool.SimTrackHits.Path = "TrackerHits_barrel" -SimG4Alg("SimG4Alg").outputs += [savetrackertool] +geantsim.outputs += [savetrackertool] from Configurables import SimG4SaveTrackerHits savetrackertool_endcap = SimG4SaveTrackerHits("saveTrackerHits_Endcap") savetrackertool_endcap.readoutNames = ["VertexEndcapCollection"] savetrackertool_endcap.SimTrackHits.Path = "positionedHits_endcap" -SimG4Alg("SimG4Alg").outputs += [savetrackertool_endcap] +geantsim.outputs += [savetrackertool_endcap] from Configurables import SimG4SaveTrackerHits savetrackertool_DCH = SimG4SaveTrackerHits("saveTrackerHits_DCH") savetrackertool_DCH.readoutNames = ["SimplifiedDriftChamberCollection"] savetrackertool_DCH.SimTrackHits.Path = "positionedHits_DCH" -SimG4Alg("SimG4Alg").outputs += [savetrackertool_DCH] +geantsim.outputs += [savetrackertool_DCH] from Configurables import SimG4ConstantMagneticFieldTool field = SimG4ConstantMagneticFieldTool() @@ -84,18 +87,14 @@ from Configurables import SimG4SaveTrajectory savetrajectorytool = SimG4SaveTrajectory("saveTrajectory") savetrajectorytool.TrajectoryPoints.Path = "trajectoryPoints" +# todo: investigate error +# geantsim.outputs += [savetrajectorytool] from Configurables import SimG4SaveParticleHistory savehisttool = SimG4SaveParticleHistory("saveHistory") savehisttool.GenParticles.Path = "SimParticles" +geantsim.outputs += [savehisttool] -from Configurables import SimG4Alg -geantsim = SimG4Alg("SimG4Alg") -geantsim.outputs += [ - savehisttool, - #todo: investigate error - #savetrajectorytool, - ] from Configurables import SimG4PrimariesFromEdmTool geantsim.eventProvider = SimG4PrimariesFromEdmTool("EdmConverter") geantsim.eventProvider.GenParticles.Path = "GenParticles" diff --git a/Examples/options/geant_fullsim_fccee_idea_pgun.py b/Examples/options/geant_fullsim_fccee_idea_pgun.py index 148d71d13..7e54233df 100644 --- a/Examples/options/geant_fullsim_fccee_idea_pgun.py +++ b/Examples/options/geant_fullsim_fccee_idea_pgun.py @@ -1,3 +1,5 @@ +import os + from Gaudi.Configuration import * import GaudiKernel.SystemOfUnits as units diff --git a/Examples/options/geant_fullsim_fccee_lar_pgun.py b/Examples/options/geant_fullsim_fccee_lar_pgun.py index 4300ca8c5..268e4a426 100644 --- a/Examples/options/geant_fullsim_fccee_lar_pgun.py +++ b/Examples/options/geant_fullsim_fccee_lar_pgun.py @@ -46,9 +46,9 @@ from Configurables import GeoSvc geoservice = GeoSvc("GeoSvc") # if FCC_DETECTORS is empty, this should use relative path to working directory -path_to_detector = os.environ.get("FCCDETECTORS", "") +path_to_detector = os.environ.get("K4GEO", "") detectors_to_use=[ - 'Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectMaster.xml', + 'FCCee/ALLEGRO/compact/ALLEGRO_o1_v01/ALLEGRO_o1_v01.xml', ] # prefix all xmls with path_to_detector geoservice.detectors = [os.path.join(path_to_detector, _det) for _det in detectors_to_use] @@ -187,7 +187,7 @@ from Configurables import CreateCaloCellPositionsFCCee createEcalBarrelPositionedCells = CreateCaloCellPositionsFCCee("ECalBarrelPositionedCells") -createEcalBarrelPositionedCells.positionsECalBarrelTool = cellPositionEcalBarrelTool +createEcalBarrelPositionedCells.positionsTool = cellPositionEcalBarrelTool createEcalBarrelPositionedCells.hits.Path = "ECalBarrelCells" createEcalBarrelPositionedCells.positionedHits.Path = "ECalBarrelPositionedCells" ApplicationMgr().TopAlg += [createEcalBarrelPositionedCells] diff --git a/Examples/options/geant_fullsim_fcchh_main.py b/Examples/options/geant_fullsim_fcchh_main.py index 642d05d94..168646556 100644 --- a/Examples/options/geant_fullsim_fcchh_main.py +++ b/Examples/options/geant_fullsim_fcchh_main.py @@ -37,8 +37,9 @@ # Geant4 algorithm # Translates EDM to G4Event, passes the event to G4, writes out outputs via tools -from Configurables import SimG4Alg -geantsim = SimG4Alg("SimG4Alg") +# !!! `geantsim` already imported from k4_workflow_blocks.fccsw.detector_fcc_hh_main !!! +# from Configurables import SimG4Alg +# geantsim = SimG4Alg("SimG4Alg") from Configurables import SimG4PrimariesFromEdmTool geantsim.eventProvider = SimG4PrimariesFromEdmTool("EdmConverter") geantsim.eventProvider.GenParticles.Path = "GenParticles" diff --git a/Examples/options/geant_fullsim_fcchh_tracker.py b/Examples/options/geant_fullsim_fcchh_tracker.py index ff5c413ec..5584d4842 100644 --- a/Examples/options/geant_fullsim_fcchh_tracker.py +++ b/Examples/options/geant_fullsim_fcchh_tracker.py @@ -10,7 +10,7 @@ from Configurables import ApplicationMgr -ApplicationMgr().EvtSel = 'NONE' +ApplicationMgr().EvtSel = 'NONE' ApplicationMgr().EvtMax = 2 ApplicationMgr().OutputLevel = INFO ApplicationMgr().ExtSvc += ['RndmGenSvc'] @@ -24,7 +24,7 @@ from Configurables import MomentumRangeParticleGun guntool = MomentumRangeParticleGun() guntool.ThetaMin = 0 -guntool.ThetaMax = 2 * constants.pi +guntool.ThetaMax = 2 * constants.pi guntool.PdgCodes = [11] from Configurables import GenAlg @@ -53,8 +53,9 @@ # Geant4 algorithm # Translates EDM to G4Event, passes the event to G4, writes out outputs via tools -from Configurables import SimG4Alg -geantsim = SimG4Alg("SimG4Alg") +# !!! `geantsim` already imported from k4_workflow_blocks.fccsw.detector_fcc_hh_tracker !!! +# from Configurables import SimG4Alg +# geantsim = SimG4Alg("SimG4Alg") from Configurables import SimG4PrimariesFromEdmTool geantsim.eventProvider = SimG4PrimariesFromEdmTool("EdmConverter") geantsim.eventProvider.GenParticles.Path = "GenParticles" diff --git a/Examples/options/geant_fullsim_field.py b/Examples/options/geant_fullsim_field.py index d2bdfef2c..fbf5d187b 100644 --- a/Examples/options/geant_fullsim_field.py +++ b/Examples/options/geant_fullsim_field.py @@ -1,6 +1,6 @@ ### | read events from a HepMC file | convert `HepMC::GenEvent` to EDM | geometry taken from GDML file (no sensitive detectors!) | FTFP_BERT physics list | empty action initialisation list | write the EDM output to ROOT file using PODIO | - +import os from Gaudi.Configuration import * from GaudiKernel import SystemOfUnits as units @@ -76,9 +76,14 @@ savehisttool.GenParticles.Path = "SimParticles" geantsim.outputs += [savehisttool] from Configurables import SimG4SaveTrackerHits -savetrackertool = SimG4SaveTrackerHits("saveTrackerHits") -savetrackertool.readoutNames = ["TrackerBarrelReadout", "TrackerEndcapReadout"] -geantsim.outputs += [savetrackertool] +savetrackerbarreltool = SimG4SaveTrackerHits("saveTrackerHits") +savetrackerbarreltool.readoutName = "TrackerBarrelReadout" +savetrackerbarreltool.SimTrackHits.Path = "TrackerBarrelReadout" +geantsim.outputs += [savetrackerbarreltool] +savetrackerendcaptool = SimG4SaveTrackerHits("saveTrackerHits") +savetrackerendcaptool.readoutName = "TrackerEndcapReadout" +savetrackerendcaptool.SimTrackHits.Path += "TrackerEndcapReadout" +geantsim.outputs += [savetrackerendcaptool] from Configurables import SimG4PrimariesFromEdmTool geantsim.eventProvider = SimG4PrimariesFromEdmTool("EdmConverter") geantsim.eventProvider.GenParticles.Path = "GenParticles" diff --git a/Examples/options/geant_fullsim_userlimits.py b/Examples/options/geant_fullsim_userlimits.py index 1d5972d7f..d944f876a 100644 --- a/Examples/options/geant_fullsim_userlimits.py +++ b/Examples/options/geant_fullsim_userlimits.py @@ -1,3 +1,5 @@ +import os + from Gaudi.Configuration import * from GaudiKernel.SystemOfUnits import mm diff --git a/Examples/options/read_podio_input.py b/Examples/options/read_podio_input.py index 40bc78333..841e4bb7f 100644 --- a/Examples/options/read_podio_input.py +++ b/Examples/options/read_podio_input.py @@ -2,7 +2,7 @@ from Configurables import ApplicationMgr ApplicationMgr().EvtSel = 'NONE' -ApplicationMgr().EvtMax = 3 +ApplicationMgr().EvtMax = 2 from Configurables import FCCDataSvc podioevent = FCCDataSvc("EventDataSvc") diff --git a/k4_workflow_blocks/fccsw/detector_fcc_hh_main.py b/k4_workflow_blocks/fccsw/detector_fcc_hh_main.py index 0be90101a..d6f30381e 100644 --- a/k4_workflow_blocks/fccsw/detector_fcc_hh_main.py +++ b/k4_workflow_blocks/fccsw/detector_fcc_hh_main.py @@ -13,37 +13,44 @@ geoservice.OutputLevel = INFO ApplicationMgr().ExtSvc += [geoservice] +from Configurables import SimG4Alg +geantsim = SimG4Alg("SimG4Alg") + # Set up SaveTools that write -SimG4Alg("SimG4Alg").outputs = [] +geantsim.outputs = [] from Configurables import SimG4SaveTrackerHits -savetrackertool = SimG4SaveTrackerHits("saveTrackerHits") -savetrackertool.readoutNames = ["TrackerBarrelReadout", "TrackerEndcapReadout"] -from Configurables import SimG4Alg -SimG4Alg("SimG4Alg").outputs += [savetrackertool] +savetrackerbarreltool = SimG4SaveTrackerHits("saveTrackerHits") +savetrackerbarreltool.readoutName = "TrackerBarrelReadout" +savetrackerbarreltool.SimTrackHits.Path = "TrackerBarrelReadout" +geantsim.outputs += [savetrackerbarreltool] +savetrackerendcaptool = SimG4SaveTrackerHits("saveTrackerHits") +savetrackerendcaptool.readoutName = "TrackerEndcapReadout" +savetrackerendcaptool.SimTrackHits.Path = "TrackerEndcapReadout" +geantsim.outputs += [savetrackerendcaptool] from Configurables import SimG4SaveCalHits saveecaltool = SimG4SaveCalHits("saveECalBarrelHits") saveecaltool.readoutNames = ["ECalBarrelEta"] saveecaltool.CaloHits.Path = "ECalBarrelHits" -SimG4Alg("SimG4Alg").outputs += [saveecaltool] +geantsim.outputs += [saveecaltool] from Configurables import SimG4SaveCalHits saveendcaptool = SimG4SaveCalHits("saveECalEndcapHits") saveendcaptool.readoutNames = ["EMECPhiEta"] saveendcaptool.CaloHits.Path = "ECalEndcapHits" -SimG4Alg("SimG4Alg").outputs += [saveendcaptool] +geantsim.outputs += [saveendcaptool] from Configurables import SimG4SaveCalHits savefwdtool = SimG4SaveCalHits("saveECalFwdHits") savefwdtool.readoutNames = ["EMFwdPhiEta"] savefwdtool.CaloHits.Path = "ECalFwdHits" -SimG4Alg("SimG4Alg").outputs += [savefwdtool] +geantsim.outputs += [savefwdtool] from Configurables import SimG4SaveCalHits savehcaltool = SimG4SaveCalHits("saveHCalHits") savehcaltool.readoutNames = ["HCalBarrelReadout"] savehcaltool.CaloHits.Path = "HCalBarrelHits" -SimG4Alg("SimG4Alg").outputs += [savehcaltool] +geantsim.outputs += [savehcaltool] diff --git a/k4_workflow_blocks/fccsw/detector_fcc_hh_tracker.py b/k4_workflow_blocks/fccsw/detector_fcc_hh_tracker.py index b6b97717b..163fe52d8 100644 --- a/k4_workflow_blocks/fccsw/detector_fcc_hh_tracker.py +++ b/k4_workflow_blocks/fccsw/detector_fcc_hh_tracker.py @@ -13,11 +13,18 @@ 'Detector/DetFCChhTrackerTkLayout/compact/Tracker.xml', ] geoservice.detectors = [ os.path.join(path_to_detectors, d) for d in detectors ] -geoservice.OutputLevel = INFO +geoservice.OutputLevel = INFO ApplicationMgr().ExtSvc += [geoservice] -from Configurables import SimG4SaveTrackerHits -savetrackertool = SimG4SaveTrackerHits("saveTrackerHits") -savetrackertool.readoutNames = ["TrackerBarrelReadout", "TrackerEndcapReadout"] from Configurables import SimG4Alg -SimG4Alg("SimG4Alg").outputs = [savetrackertool] +geantsim = SimG4Alg("SimG4Alg") + +from Configurables import SimG4SaveTrackerHits +savetrackerbarreltool = SimG4SaveTrackerHits("saveTrackerHits") +savetrackerbarreltool.readoutName = "TrackerBarrelReadout" +savetrackerbarreltool.SimTrackHits.Path = "TrackerBarrelReadout" +geantsim.outputs = [savetrackerbarreltool] +savetrackerendcaptool = SimG4SaveTrackerHits("saveTrackerHits") +savetrackerendcaptool.readoutName = "TrackerEndcapReadout" +savetrackerendcaptool.SimTrackHits.Path = "TrackerEndcapReadout" +geantsim.outputs += [savetrackerendcaptool]