Merge branch 'mhodgkin_updateRecoConfig_May2021' into 'master'

Updates to ComponentAccumulator RecoSteering job transform

See merge request atlas/athena!44143

Calorimeter/CaloRec/python/CaloRecoConfig.py

@@ -3,7 +3,7 @@
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
 
-def CaloRecoCfg(configFlags, clustersname="CaloTopoClusters"):
+def CaloRecoCfg(configFlags, clustersname="CaloTopoClusters",doLCCalib=None):
     
     result=ComponentAccumulator()
     if not configFlags.Input.isMC:
@@ -33,7 +33,7 @@ def CaloRecoCfg(configFlags, clustersname="CaloTopoClusters"):
     
     #Configure topo-cluster builder
     from CaloRec.CaloTopoClusterConfig import CaloTopoClusterCfg
-    result.merge(CaloTopoClusterCfg(configFlags, clustersname=clustersname))
+    result.merge(CaloTopoClusterCfg(configFlags, clustersname=clustersname, doLCCalib=doLCCalib))
 
     return result
 

InnerDetector/InDetConfig/python/TrackRecoConfig.py

@@ -251,10 +251,8 @@ def TrackRecoCfg(flags):
     # needed for brem/seeding, TODO decided if needed here
     from LArBadChannelTool.LArBadChannelConfig import LArBadFebCfg
     result.merge(LArBadFebCfg(flags))
-    from CaloRec.CaloCellMakerConfig import CaloCellMakerCfg
-    result.merge(CaloCellMakerCfg(flags))
-    from CaloRec.CaloTopoClusterConfig import CaloTopoClusterCfg
-    result.merge(CaloTopoClusterCfg(flags, doLCCalib=False))
+    from CaloRec.CaloRecoConfig import CaloRecoCfg
+    result.merge(CaloRecoCfg(flags,doLCCalib=True))
     from egammaAlgs.egammaTopoClusterCopierConfig import egammaTopoClusterCopierCfg
     result.merge(egammaTopoClusterCopierCfg(flags))
     from InDetConfig.InDetRecCaloSeededROISelectionConfig import CaloClusterROI_SelectorCfg

Reconstruction/RecJobTransforms/python/RecoSteering.py

@@ -12,6 +12,7 @@ def RecoSteering(flags):
     The selftest available below can be used for simple jobs, yet full functionality is achieved with tansforms that set many flags.
     """
     acc = ComponentAccumulator()
+
     # setup input    
     if flags.Input.Format == 'BS':
         from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
@@ -24,7 +25,7 @@ def RecoSteering(flags):
 
     # calorimeter    
     from CaloRec.CaloRecoConfig import CaloRecoCfg
-    acc.merge(CaloRecoCfg(flags))
+    acc.merge(CaloRecoCfg(flags,doLCCalib=True))
     log.info("---------- Configured calorimeter reconstruction")
 
     # ID    
@@ -44,6 +45,9 @@ def RecoSteering(flags):
       acc.merge(CaloExtensionBuilderAlgCfg(flags))
       log.info("---------- Configured track calorimeter extension builder")
 
+    from eflowRec.PFRun3Config import PFCfg
+    acc.merge(PFCfg(flags))
+
     # physics objects
     # egamma
     # jets

Reconstruction/eflowRec/python/PFRun3Config.py

@@ -99,10 +99,9 @@ def PFCfg(inputFlags,**kwargs):
     result.merge(MagneticFieldSvcCfg(inputFlags))
 
     #Configure topocluster algorithmsm, and associated conditions
-    from CaloRec.CaloTopoClusterConfig import CaloTopoClusterCfg
-    result.merge(CaloTopoClusterCfg(inputFlags,clustersname="CaloTopoClusters",
-                                    doLCCalib=True))
-    
+    from CaloRec.CaloRecoConfig import CaloRecoCfg
+    result.merge(CaloRecoCfg(inputFlags,doLCCalib=True))
+
     from CaloRec.CaloTopoClusterConfig import caloTopoCoolFolderCfg
     result.merge(caloTopoCoolFolderCfg(inputFlags))