Revert "Merge branch 'cherry-pick-6ed76fe6' into '21.0'"

This reverts merge request !3916

Former-commit-id: 4f997066

Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuHypoConfig.py

@@ -168,27 +168,6 @@ class EFBMuMuHypo_Jpsi (TrigEFBMuMuHypo):
         online = TrigEFBMuMuHypoOnlineMonitoring()
         self.AthenaMonTools = [ validation, online, time ]
 
-class EFBMuMuHypo_Jpsi_noId (TrigEFBMuMuHypo):
-    __slots__ = []
-    def __init__(self, name = "EFBMuMuHypo_Jpsi_noId"):
-        super( EFBMuMuHypo_Jpsi_noId, self ).__init__( name )
-
-        # AcceptAll flag: if true take events regardless of cuts
-        self.AcceptAll = False
-
-        # EF Bmumu cuts
-        self.LowerMassCut      = 2500.
-        self.UpperMassCut      = 4300.
-        self.ApplyUpperMassCut = True
-        self.ApplyChi2Cut      = False
-
-        from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
-        time = TrigTimeHistToolConfig("Time")
-
-        validation = TrigEFBMuMuHypoValidationMonitoring()
-        online = TrigEFBMuMuHypoOnlineMonitoring()
-        self.AthenaMonTools = [ validation, online, time ]
-
 class EFBMuMuHypo_Upsi (TrigEFBMuMuHypo):
     __slots__ = []
     def __init__(self, name = "EFBMuMuHypo_Upsi"):
@@ -375,7 +354,7 @@ class EFBMuMuHypo_Z (TrigEFBMuMuHypo):
         self.LowerMassCut      = 60000.
         self.UpperMassCut      = 120000.
         self.ApplyUpperMassCut = True
-        self.ApplyChi2Cut      = False
+        self.Chi2VtxCut        = 20.
 
         from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
         time = TrigTimeHistToolConfig("Time")

Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py

@@ -46,8 +46,6 @@ def generateChainDefs(chainDict):
     
     if "bBmumuxv3" in chainDict['chainName'] :  # OI this mc 2016 chain was never enabled, and is not needed in future
         thisIsBphysChain = False
-    if 'Zmumu' in chainDict['chainName'] or 'idperf' in chainDict['chainName']  : # keep idperf chains with default muon config
-        thisIsBphysChain = False
     if 'legacyVtx' in chainDict['chainName'] :  # OI Drell-Yan chains are not migrated
         thisIsBphysChain = False
     if 'invm' in chainDict['chainName'] :  # OI Drell-Yan chains are not migrated
@@ -754,11 +752,11 @@ def bMultipleOptionTopos(theChainDef, chainDict, inputTEsL2, inputTEsEF, topoSta
         from TrigBphysHypo.TrigL2BMuMuFexConfig import L2BMuMuFex_noId
         from TrigBphysHypo.TrigL2BMuMuHypoConfig import L2BMuMuHypo_Jpsi_noId
         from TrigBphysHypo.TrigEFBMuMuFexConfig import EFBMuMuFex_noId
-        from TrigBphysHypo.TrigEFBMuMuHypoConfig import EFBMuMuHypo_Jpsi_noId
+        from TrigBphysHypo.TrigEFBMuMuHypoConfig import EFBMuMuHypo_Jpsi
         L2Fex  = L2BMuMuFex_noId()
         L2Hypo = L2BMuMuHypo_Jpsi_noId()
         EFFex  = EFBMuMuFex_noId()
-        EFHypo = EFBMuMuHypo_Jpsi_noId()
+        EFHypo = EFBMuMuHypo_Jpsi()
     elif ('bDimu' in topoAlgs) & ('noL2' in topoAlgs):
         from TrigBphysHypo.TrigL2BMuMuFexConfig  import L2BMuMuFex_DiMu_passL2
         from TrigBphysHypo.TrigL2BMuMuHypoConfig import L2BMuMuHypo_DiMu_passL2