Merge branch 'check_ip' into 'main'

fix the tool name prefix in PHYS and FTAG1

See merge request !71544

PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG1.py

@@ -23,10 +23,11 @@ def FTAG1KernelCfg(flags, name='FTAG1Kernel', **kwargs):
     from DerivationFrameworkPhys.PhysCommonConfig import PhysCommonAugmentationsCfg
     acc.merge(PhysCommonAugmentationsCfg(flags, TriggerListsHelper = kwargs['TriggerListsHelper']))
 
+    nametag = name.replace('Kernel', '') #get the name to label the tools below such that other formats can use this KernelCfg
     augmentationTools = []
     # Add V0Tool
     if flags.BTagging.AddV0Finder:
-        acc.merge(V0ToolCfg(flags, augmentationTools=augmentationTools, tool_name_prefix="FTAG1", container_name_prefix="FTAG"))
+        acc.merge(V0ToolCfg(flags, augmentationTools=augmentationTools, tool_name_prefix=nametag, container_name_prefix="FTAG"))
 
     # thinning tools
     thinningTools = []

PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py

@@ -28,19 +28,20 @@ def PHYSKernelCfg(flags, name='PHYSKernel', **kwargs):
     ))
 
     # Thinning tools
-    # These are set up in PhysCommonThinningConfig. Only thing needed here the list of tools to schedule 
+    # These are set up in PhysCommonThinningConfig. Only thing needed here the list of tools to schedule
+    nametag = name.replace('Kernel', '') #get the name to label the tools below such that other formats can use this KernelCfg
     thinningToolsArgs = {
-        'TrackParticleThinningToolName'       : "PHYSTrackParticleThinningTool",
-        'MuonTPThinningToolName'              : "PHYSMuonTPThinningTool",
-        'TauJetThinningToolName'              : "PHYSTauJetThinningTool",
-        'TauJets_MuonRMThinningToolName'      : "PHYSTauJets_MuonRMThinningTool",
-        'DiTauTPThinningToolName'             : "PHYSDiTauTPThinningTool",
-        'DiTauLowPtThinningToolName'          : "PHYSDiTauLowPtThinningTool",
-        'DiTauLowPtTPThinningToolName'        : "PHYSDiTauLowPtTPThinningTool",
+        'TrackParticleThinningToolName'       : nametag+"TrackParticleThinningTool",
+        'MuonTPThinningToolName'              : nametag+"MuonTPThinningTool",
+        'TauJetThinningToolName'              : nametag+"TauJetThinningTool",
+        'TauJets_MuonRMThinningToolName'      : nametag+"TauJets_MuonRMThinningTool",
+        'DiTauTPThinningToolName'             : nametag+"DiTauTPThinningTool",
+        'DiTauLowPtThinningToolName'          : nametag+"DiTauLowPtThinningTool",
+        'DiTauLowPtTPThinningToolName'        : nametag+"DiTauLowPtTPThinningTool",
     } 
     # for AOD produced before 24.0.17, the electron removal tau is not available
     if kwargs.get('TauJets_EleRM_in_input', False):
-        thinningToolsArgs['TauJets_EleRMThinningToolName'] = "PHYSTauJets_EleRMThinningTool"
+        thinningToolsArgs['TauJets_EleRMThinningToolName'] = nametag+"TauJets_EleRMThinningTool"
     # Configure the thinning tools
     from DerivationFrameworkPhys.PhysCommonThinningConfig import PhysCommonThinningCfg
     acc.merge(PhysCommonThinningCfg(flags, StreamName = kwargs['StreamName'], **thinningToolsArgs))