From 643f253fe898d503cd5ff6f24a778891b71e7e67 Mon Sep 17 00:00:00 2001
From: Daniel Noel <daniel.louis.noel@cern.ch>
Date: Thu, 7 Mar 2019 11:38:54 +0000
Subject: [PATCH] rewritten ActiveSensitveDetectorTool
---
.../LArG4/LArG4SD/python/LArG4SDToolConfig.py | 18 ++++++++++--------
.../LArG4SD/test/LArG4SDToolConfig_test.py | 6 +++++-
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/LArCalorimeter/LArG4/LArG4SD/python/LArG4SDToolConfig.py b/LArCalorimeter/LArG4/LArG4SD/python/LArG4SDToolConfig.py
index 361aa1600d4..36b5bc44958 100644
--- a/LArCalorimeter/LArG4/LArG4SD/python/LArG4SDToolConfig.py
+++ b/LArCalorimeter/LArG4/LArG4SD/python/LArG4SDToolConfig.py
@@ -9,31 +9,33 @@ from LArG4SD.LArG4SDConf import LArG4__FCALSDTool
from LArG4SD.LArG4SDConf import LArG4__HECSDTool
from LArG4SD.LArG4SDConf import LArG4__MiniFCALSDTool
from LArG4SD.LArG4SDConf import LArG4__DeadSDTool
+from LArG4SD.LArG4SDConf import LArG4__ActiveSDTool
-def getLArActiveSensitiveDetector(name="LArActiveSensitiveDetector", **kwargs):
+#todo - investigate old comments in the code
+
+def LArActiveSensitiveDetectorToolCfg(ConfigFlags, name="LArActiveSensitiveDetector", **kwargs):
## Main configuration
- from G4AtlasApps.SimFlags import simFlags
- if simFlags.SimLayout.get_Value() not in ["tb_LArH6_2003","tb_LArH6_2002"]:
+ if ConfigFlags.GeoModel.AtlasVersion not in ["tb_LArH6_2003","tb_LArH6_2002"]:
kwargs.setdefault("StacVolumes",["LArMgr::LAr::EMB::STAC"])
kwargs.setdefault("PresamplerVolumes",["LArMgr::LAr::Barrel::Presampler::Module"])
kwargs.setdefault("NegIWVolumes",["LArMgr::LAr::EMEC::Neg::InnerWheel"])
kwargs.setdefault("NegOWVolumes",["LArMgr::LAr::EMEC::Neg::OuterWheel"])
kwargs.setdefault("BOBarretteVolumes",["LArMgr::LAr::EMEC::BackOuterBarrette::Module::Phidiv"])
kwargs.setdefault("MiniVolumes",["LArMgr::MiniFCAL::Wafer"])
- if simFlags.SimLayout.get_Value()!="tb_LArH6_2003":
+ if ConfigFlags.GeoModel.AtlasVersion!="tb_LArH6_2003":
kwargs.setdefault("PosIWVolumes",["LArMgr::LAr::EMEC::Pos::InnerWheel"])
kwargs.setdefault("PosOWVolumes",["LArMgr::LAr::EMEC::Pos::OuterWheel"])
kwargs.setdefault("PresVolumes", ["LArMgr::LAr::Endcap::Presampler::LiquidArgon"])
kwargs.setdefault("SliceVolumes",["LArMgr::LAr::HEC::Module::Depth::Slice"])
- if simFlags.SimLayout.get_Value() not in ["tb_LArH6_2002"]:
+ if ConfigFlags.GeoModel.AtlasVersion not in ["tb_LArH6_2002"]:
kwargs.setdefault("FCAL1Volumes",["LArMgr::LAr::FCAL::Module1::Gap"])
kwargs.setdefault("FCAL2Volumes",["LArMgr::LAr::FCAL::Module2::Gap"])
- kwargs.setdefault("FCAL3Volumes",["LArMgr::LAr::FCAL::Module3::Gap"])
+ kwargs.setdefault("FCAL3Volumes",["LArMgr::LAr::FCAL::Module3::Gap"])
# Running PID calibration hits?
- kwargs.setdefault("ParticleID",simFlags.ParticleID())
+ kwargs.setdefault("ParticleID",ConfigFlags.Sim.ParticleID)
# No effect currently
kwargs.setdefault("OutputCollectionNames", ["LArCalibrationHitActive"])
- return CfgMgr.LArG4__ActiveSDTool(name, **kwargs)
+ return LArG4__ActiveSDTool(name, **kwargs)
def LArDeadSensitiveDetectorToolCfg(ConfigFlags, name="LArDeadSensitiveDetector", **kwargs):
## Main configuration
diff --git a/LArCalorimeter/LArG4/LArG4SD/test/LArG4SDToolConfig_test.py b/LArCalorimeter/LArG4/LArG4SD/test/LArG4SDToolConfig_test.py
index c5f3a7f3ceb..13527954494 100755
--- a/LArCalorimeter/LArG4/LArG4SD/test/LArG4SDToolConfig_test.py
+++ b/LArCalorimeter/LArG4/LArG4SD/test/LArG4SDToolConfig_test.py
@@ -40,7 +40,8 @@ if __name__ == '__main__':
from LArG4SD.LArG4SDToolConfig import LArHECSensitiveDetectorCfg
from LArG4SD.LArG4SDToolConfig import LArMiniFCALSensitiveDetectorToolCfg
from LArG4SD.LArG4SDToolConfig import LArDeadSensitiveDetectorToolCfg
-
+ from LArG4SD.LArG4SDToolConfig import LArActiveSensitiveDetectorToolCfg
+
acc1, tool1 = LArEMBSensitiveDetectorCfg(ConfigFlags)
acc1.addPublicTool(tool1)
cfg.merge(acc1)
@@ -63,6 +64,9 @@ if __name__ == '__main__':
toolDeadSensitiveDetector = LArDeadSensitiveDetectorToolCfg(ConfigFlags)
cfg.addPublicTool(toolDeadSensitiveDetector)
+
+ toolActiveSensitiveDetector = LArActiveSensitiveDetectorToolCfg(ConfigFlags)
+ cfg.addPublicTool(toolActiveSensitiveDetector)
--
GitLab