Commit 0d2afd3d authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'master-wrap-indet' into 'master'

Add ability to wrap InDet config in RecExCommon

See merge request atlas/athena!44489
parents 319da1c6 8aaa5d70
...@@ -1204,6 +1204,13 @@ class doTTVADecos(InDetFlagsJobProperty): ...@@ -1204,6 +1204,13 @@ class doTTVADecos(InDetFlagsJobProperty):
allowedTypes = ['bool'] allowedTypes = ['bool']
StoredValue = True StoredValue = True
## Decide whether to wrap the new configuration in the old.
class useNewConfig(JobProperty):
statusOn=True
allowedTypes=['bool']
StoredValue=False
##----------------------------------------------------------------------------- ##-----------------------------------------------------------------------------
## 2nd step ## 2nd step
## Definition of the InDet flag container ## Definition of the InDet flag container
...@@ -2801,7 +2808,8 @@ _list_InDetJobProperties = [Enabled, ...@@ -2801,7 +2808,8 @@ _list_InDetJobProperties = [Enabled,
useMuForTRTErrorScaling, useMuForTRTErrorScaling,
writeSeedValNtuple, writeSeedValNtuple,
doTRTPIDNN, doTRTPIDNN,
doTTVADecos doTTVADecos,
useNewConfig
] ]
for j in _list_InDetJobProperties: for j in _list_InDetJobProperties:
jobproperties.InDetJobProperties.add_JobProperty(j) jobproperties.InDetJobProperties.add_JobProperty(j)
......
...@@ -13,6 +13,8 @@ import PerfMonComps.DomainsRegistry as pdr ...@@ -13,6 +13,8 @@ import PerfMonComps.DomainsRegistry as pdr
from AODFix.AODFix import * from AODFix.AODFix import *
AODFix_Init() AODFix_Init()
wrap_indet = True
#First do Calo-Reco #First do Calo-Reco
pdr.flag_domain('calo') pdr.flag_domain('calo')
protectedInclude ("CaloRec/CaloRec_jobOptions.py") protectedInclude ("CaloRec/CaloRec_jobOptions.py")
...@@ -32,6 +34,19 @@ pdr.flag_domain('id') ...@@ -32,6 +34,19 @@ pdr.flag_domain('id')
if DetFlags.detdescr.ID_on(): if DetFlags.detdescr.ID_on():
protectedInclude( "InDetRecExample/InDetRec_jobOptions.py" ) protectedInclude( "InDetRecExample/InDetRec_jobOptions.py" )
AODFix_postInDetRec() AODFix_postInDetRec()
if jobproperties.InDetJobProperties.useNewConfig():
print('Wrapping new configuration')
from AthenaConfiguration.ComponentAccumulator import CAtoGlobalWrapper
from InDetConfig.TrackRecoConfig import TrackRecoCfg
from AthenaConfiguration.OldFlags2NewFlags import getNewConfigFlags
# Translate all needed flags from old jobProperties to a new AthConfigFlag Container
ConfigFlags = getNewConfigFlags()
# TODO Keep here for the moment, since we still have debugging to do.
from AthenaCommon.Logging import logging
log = logging.getLogger( "Py:conf2toConfigurable" )
log.setLevel(DEBUG)
CAtoGlobalWrapper(TrackRecoCfg,ConfigFlags)
# functionality : FTK reconstruction # functionality : FTK reconstruction
if DetFlags.detdescr.FTK_on() : if DetFlags.detdescr.FTK_on() :
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment