Merge branch 'master-egammaTrackingConfigFix' into 'master'

update configuration due to NnClusterizationFactory change

See merge request atlas/athena!16004

Former-commit-id: 6c7f58c0

Reconstruction/egamma/egammaRec/python/EMCommonRefitter.py

@@ -22,16 +22,8 @@ def CreateEgammaRotCreator():
       from GaudiSvc.GaudiSvcConf import THistSvc
       svcMgr += THistSvc()    
 
-    # --- neutral network tools
-    import sys,os    
-    from TrkNeuralNetworkUtils.TrkNeuralNetworkUtilsConf import Trk__NeuralNetworkToHistoTool
-    egNeuralNetworkToHistoTool=Trk__NeuralNetworkToHistoTool(name = "egNeuralNetworkToHistoTool")
-    ToolSvc += egNeuralNetworkToHistoTool
-
     #--- new NN factor   
     # COOL binding
-    from IOVDbSvc.CondDB import conddb
-    conddb.addFolder("PIXEL_OFL","/PIXEL/PixelClustering/PixelClusNNCalib")               
     # --- Select the necessary settings when running on run 1 data/MC
     # --- since a correction is needed to fix biases when running on new run 2 compatible calibation
 
@@ -45,23 +37,22 @@ def CreateEgammaRotCreator():
     if ( not geoFlags.Run() in ["RUN2", "RUN3"] ) :
       egNnClusterizationFactory = InDet__NnClusterizationFactory( name                 = "egNnClusterizationFactory",
                                                                   PixelLorentzAngleTool= ToolSvc.PixelLorentzAngleTool,
-                                                                  NetworkToHistoTool   = egNeuralNetworkToHistoTool,
                                                                   doRunI = True,
                                                                   useToT = False,
                                                                   useRecenteringNNWithoutTracks = True,
                                                                   useRecenteringNNWithTracks = False,
                                                                   correctLorShiftBarrelWithoutTracks = 0,
                                                                   correctLorShiftBarrelWithTracks = 0.030,
-                                                                  LoadNoTrackNetwork   = True,
-                                                                  LoadWithTrackNetwork = True)
+                                                                  NnCollectionReadKey                = 'PixelClusterNN',
+                                                                  NnCollectionWithTrackReadKey       = 'PixelClusterNNWithTrack')
         
     else:
       egNnClusterizationFactory = InDet__NnClusterizationFactory( name                 = "egNnClusterizationFactory",
                                                                   PixelLorentzAngleTool= ToolSvc.PixelLorentzAngleTool,
-                                                                  NetworkToHistoTool   = egNeuralNetworkToHistoTool,
-                                                                  LoadNoTrackNetwork   = True,
                                                                   useToT = InDetFlags.doNNToTCalibration(),
-                                                                  LoadWithTrackNetwork = True)               
+                                                                  NnCollectionReadKey                = 'PixelClusterNN',
+                                                                  NnCollectionWithTrackReadKey       = 'PixelClusterNNWithTrack')
+
     ToolSvc += egNnClusterizationFactory 
       
   #End of do cluster splitting