From 3864b6adfba9641ece4f3da804e1450cc59b184b Mon Sep 17 00:00:00 2001
From: Petr Jacka <petr.jacka@cern.ch>
Date: Fri, 1 Sep 2017 15:16:07 +0000
Subject: [PATCH] reverted changes
Former-commit-id: 302e52c25d95e7f8bdf7221559804b97e63fdbc5
---
.../python/AdditionalConfig.py | 65 +++++++++++++++----
1 file changed, 54 insertions(+), 11 deletions(-)
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/AdditionalConfig.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/AdditionalConfig.py
index 7e7d36b7dd02d..1624de0ae4122 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/AdditionalConfig.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/AdditionalConfig.py
@@ -12,10 +12,12 @@ from AthenaCommon import CfgMgr
from AthenaCommon.Constants import * # FATAL,ERROR etc.
from AthenaCommon.SystemOfUnits import *
from AthenaCommon.DetFlags import DetFlags
+from ISF_Algorithms.collection_merger_helpers import generate_mergeable_collection_name
+
-from ISF_Config.ISF_jobProperties import ISF_Flags # IMPORTANT: Flags must be set before tools are retrieved
from ISF_FastCaloSimServices.ISF_FastCaloSimJobProperties import ISF_FastCaloSimFlags
+
def getAdditionalParticleParametrizationFileNames():
return [
"DB=/GLOBAL/AtlfastII/FastCaloSimParam:2:EnergyResults/pdgid_211/EN_1000/eta_central",
@@ -672,7 +674,7 @@ def getPunchThroughTool(name="ISF_PunchThroughTool", **kwargs):
kwargs.setdefault("MinEnergy" , [ 938.3, 135.6, 50., 50., 105.7 ] )
kwargs.setdefault("MaxNumParticles" , [ -1, -1, -1, -1, -1 ] )
kwargs.setdefault("EnergyFactor" , [ 1., 1., 1., 1., 1. ] )
- kwargs.setdefault("BarcodeSvc" , ISF_Flags.BarcodeService() )
+ kwargs.setdefault("BarcodeSvc" , simFlags.TruthStrategy.BarcodeServiceName() )
kwargs.setdefault("EnvelopeDefSvc" , getService('AtlasGeometry_EnvelopeDefSvc') )
kwargs.setdefault("BeamPipeRadius" , 500. )
@@ -701,15 +703,13 @@ def getNITimedExtrapolator(name="ISF_NITimedExtrapolator", **kwargs):
from TrkExTools.TrkExToolsConf import Trk__TimedExtrapolator as TimedExtrapolator
return TimedExtrapolator(name, **kwargs )
+ def getTimedExtrapolator(name="TimedExtrapolator", **kwargs):
+ kwargs.setdefault("MaterialEffectsUpdators" , [ 'ISF_NIMatEffUpdator' ])
+ kwargs.setdefault("ApplyMaterialEffects" , False )
+ kwargs.setdefault("STEP_Propagator" , 'ISF_NIPropagator' )
-def getTimedExtrapolator(name="TimedExtrapolator", **kwargs):
- kwargs.setdefault("MaterialEffectsUpdators" , [ 'ISF_NIMatEffUpdator' ])
- kwargs.setdefault("ApplyMaterialEffects" , False )
- kwargs.setdefault("STEP_Propagator" , 'ISF_NIPropagator' )
-
- from TrkExTools.TrkExToolsConf import Trk__TimedExtrapolator as TimedExtrapolator
- return TimedExtrapolator(name, **kwargs )
-
+ from TrkExTools.TrkExToolsConf import Trk__TimedExtrapolator as TimedExtrapolator
+ return TimedExtrapolator(name, **kwargs )
## FastShowerCellBuilderTool
@@ -799,7 +799,50 @@ def getPileupFastShowerCellBuilderTool(name="ISF_PileupFastShowerCellBuilderTool
kwargs.setdefault("sampling_energy_reweighting", weightsfcs )
return getFastShowerCellBuilderTool(name, **kwargs)
-def getFastHitConvertTool(name="ISF_FastHitConvertTool",**kwargs):
+def getFastHitConvertTool(name="ISF_FastHitConvertTool", **kwargs):
+ mergeable_collection_suffix = "_FastCaloSim"
+
+ EMB_hits_bare_collection_name = "LArHitEMB"
+ EMB_hits_merger_input_property = "LArEMBHits"
+ EMB_hits_collection_name = generate_mergeable_collection_name(
+ EMB_hits_bare_collection_name,
+ mergeable_collection_suffix,
+ EMB_hits_merger_input_property)
+
+ EMEC_hits_bare_collection_name = "LArHitEMEC"
+ EMEC_hits_merger_input_property = "LArEMECHits"
+ EMEC_hits_collection_name = generate_mergeable_collection_name(
+ EMEC_hits_bare_collection_name,
+ mergeable_collection_suffix,
+ EMEC_hits_merger_input_property)
+
+ FCAL_hits_bare_collection_name = "LArHitFCAL"
+ FCAL_hits_merger_input_property = "LArFCALHits"
+ FCAL_hits_collection_name = generate_mergeable_collection_name(
+ FCAL_hits_bare_collection_name,
+ mergeable_collection_suffix,
+ FCAL_hits_merger_input_property)
+
+ HEC_hits_bare_collection_name = "LArHitHEC"
+ HEC_hits_merger_input_property = "LArHECHits"
+ HEC_hits_collection_name = generate_mergeable_collection_name(
+ HEC_hits_bare_collection_name,
+ mergeable_collection_suffix,
+ HEC_hits_merger_input_property)
+
+ tile_hits_bare_collection_name = "TileHitVec"
+ tile_hits_merger_input_property = "TileHits"
+ tile_hits_collection_name = generate_mergeable_collection_name(
+ tile_hits_bare_collection_name,
+ mergeable_collection_suffix,
+ tile_hits_merger_input_property)
+
+ kwargs.setdefault('embHitContainername', EMB_hits_collection_name)
+ kwargs.setdefault('emecHitContainername', EMEC_hits_collection_name)
+ kwargs.setdefault('fcalHitContainername', FCAL_hits_collection_name)
+ kwargs.setdefault('hecHitContainername', HEC_hits_collection_name)
+ kwargs.setdefault('tileHitContainername', tile_hits_collection_name)
+
from FastCaloSimHit.FastCaloSimHitConf import FastHitConvertTool
return FastHitConvertTool(name,**kwargs)
--
GitLab