From eb52e9279ee02a60503edcf419daafecd064c493 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Mon, 19 Jun 2017 21:08:03 +0200
Subject: [PATCH] DDSim: lcdd --> detectorDescription
---
DDSim/DD4hepSimulation.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/DDSim/DD4hepSimulation.py b/DDSim/DD4hepSimulation.py
index dae9c856b..b5ea32b8c 100644
--- a/DDSim/DD4hepSimulation.py
+++ b/DDSim/DD4hepSimulation.py
@@ -235,16 +235,16 @@ class DD4hepSimulation(object):
exit(1)
@staticmethod
- def getDetectorLists( lcdd ):
- ''' get lists of trackers and calorimeters that are defined in lcdd (the compact xml file)'''
+ def getDetectorLists( detectorDescription ):
+ ''' get lists of trackers and calorimeters that are defined in detectorDescription (the compact xml file)'''
import DDG4
# if len(detectorList):
# print " subset list of detectors given - will only instantiate these: " , detectorList
trackers,calos = [],[]
- for i in lcdd.detectors():
+ for i in detectorDescription.detectors():
det = DDG4.DetElement(i.second.ptr())
name = det.name()
- sd = lcdd.sensitiveDetector( name )
+ sd = detectorDescription.sensitiveDetector( name )
if sd.isValid():
detType = sd.type()
# if len(detectorList) and not(name in detectorList):
@@ -273,9 +273,9 @@ class DD4hepSimulation(object):
#kernel.setOutputLevel('Compact',1)
kernel.loadGeometry("file:"+ self.compactFile )
- lcdd = kernel.lcdd()
+ detectorDescription = kernel.detectorDescription()
- DDG4.importConstants( lcdd )
+ DDG4.importConstants( detectorDescription )
#----------------------------------------------------------------------------------
@@ -433,9 +433,9 @@ class DD4hepSimulation(object):
exit(1)
#=================================================================================
- # get lists of trackers and calorimeters in lcdd
+ # get lists of trackers and calorimeters in detectorDescription
- trk,cal = self.getDetectorLists( lcdd )
+ trk,cal = self.getDetectorLists( detectorDescription )
# ---- add the trackers:
try:
--
GitLab