From ae67ac5a01472049b0eecc910ab6a358013fd2ed Mon Sep 17 00:00:00 2001
From: Easwar Anand Narayanan <easwar.anand.narayanan@cern.ch>
Date: Tue, 8 Sep 2020 04:28:45 +0000
Subject: [PATCH] Add a few more B-physics dimuon chains (ATR-20049)

---
 .../python/TrigMultiTrkComboHypoConfig.py       | 17 +++++++++++++++--
 .../share/ref_RDOtoRDOTrig_mt1_build.ref        | 15 +++++++++++++++
 .../TriggerTest/share/ref_data_v1Dev_build.ref  | 15 +++++++++++++++
 .../HLTMenuConfig/Bphysics/BphysicsDef.py       |  5 ++++-
 .../HLTMenuConfig/Menu/Physics_pp_run3_v1.py    |  5 +++++
 .../python/HLTMenuConfig/Menu/SignatureDicts.py |  2 +-
 6 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py
index a0b39b9139ea..13450a5d28fb 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py
@@ -106,12 +106,25 @@ class TrigMultiTrkComboHypoConfig(object):
         elif 'bBmumu' in topoAlgs:
             tool.LowerMassCut =  4000 #MeV
             tool.UpperMassCut =  8500 #MeV
-            tool.Chi2VtxCut = 60
 
         elif 'bDimu' in topoAlgs:
-            tool.LowerMassCut =   100 #MeV
+            tool.LowerMassCut =  1500 #MeV
             tool.UpperMassCut = 14000 #MeV
 
+        elif 'bDimu2700' in topoAlgs:
+            tool.LowerMassCut =   100 #MeV
+            tool.UpperMassCut =  2700 #MeV
+
+        elif 'bPhi' in topoAlgs:
+            tool.LowerMassCut =   940 #MeV
+            tool.UpperMassCut =  1100 #MeV
+            tool.Chi2VtxCut = 10
+
+        elif 'bTau' in topoAlgs:
+            tool.LowerMassCut =     0 #MeV
+            tool.UpperMassCut =  2700 #MeV
+            tool.Chi2VtxCut = 50
+
         tool.MonTool = TrigMultiTrkComboHypoToolMonitoring('MonTool')
         return tool
 
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
index 16482c911b38..e49fca3a207e 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
@@ -358,9 +358,24 @@ TrigSignatureMoniMT                                 INFO -- #2386882549 Features
 TrigSignatureMoniMT                                 INFO HLT_mu10_lateMu_L1MU10 #48780310
 TrigSignatureMoniMT                                 INFO -- #48780310 Events           10         10         0          0          0          0          0          0          -          -          -          -          -          -          0
 TrigSignatureMoniMT                                 INFO -- #48780310 Features                               0          0          0          0          0          0          -          -          -          -          -          -
+TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bBmumu_L1MU11_2MU6 #947854469
+TrigSignatureMoniMT                                 INFO -- #947854469 Events          4          4          0          0          0          0          4          0          3          0          -          -          -          -          0
+TrigSignatureMoniMT                                 INFO -- #947854469 Features                              0          0          0          0          8          0          6          0          -          -          -          -
+TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bDimu2700_L1MU11_2MU6 #4293593869
+TrigSignatureMoniMT                                 INFO -- #4293593869 Events         4          4          0          0          0          0          4          0          3          0          -          -          -          -          0
+TrigSignatureMoniMT                                 INFO -- #4293593869 Features                             0          0          0          0          8          0          6          0          -          -          -          -
+TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bDimu_L1MU11_2MU6 #2381335347
+TrigSignatureMoniMT                                 INFO -- #2381335347 Events         4          4          0          0          0          0          4          0          3          0          -          -          -          -          0
+TrigSignatureMoniMT                                 INFO -- #2381335347 Features                             0          0          0          0          8          0          6          0          -          -          -          -
 TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6 #2504965945
 TrigSignatureMoniMT                                 INFO -- #2504965945 Events         4          4          0          0          0          0          4          0          3          0          -          -          -          -          0
 TrigSignatureMoniMT                                 INFO -- #2504965945 Features                             0          0          0          0          8          0          6          0          -          -          -          -
+TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bPhi_L1MU11_2MU6 #2079901197
+TrigSignatureMoniMT                                 INFO -- #2079901197 Events         4          4          0          0          0          0          4          0          3          0          -          -          -          -          0
+TrigSignatureMoniMT                                 INFO -- #2079901197 Features                             0          0          0          0          8          0          6          0          -          -          -          -
+TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bTau_L1MU11_2MU6 #1292401093
+TrigSignatureMoniMT                                 INFO -- #1292401093 Events         4          4          0          0          0          0          4          0          3          0          -          -          -          -          0
+TrigSignatureMoniMT                                 INFO -- #1292401093 Features                             0          0          0          0          8          0          6          0          -          -          -          -
 TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6 #1171632195
 TrigSignatureMoniMT                                 INFO -- #1171632195 Events         4          4          0          0          0          0          4          0          3          0          -          -          -          -          0
 TrigSignatureMoniMT                                 INFO -- #1171632195 Features                             0          0          0          0          8          0          6          0          -          -          -          -
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 60c5a3227c8e..f989970e0928 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -358,9 +358,24 @@ TrigSignatureMoniMT                                 INFO -- #2386882549 Features
 TrigSignatureMoniMT                                 INFO HLT_mu10_lateMu_L1MU10 #48780310
 TrigSignatureMoniMT                                 INFO -- #48780310 Events           20         20         0          0          0          0          0          0          -          -          -          -          -          -          0          
 TrigSignatureMoniMT                                 INFO -- #48780310 Features                               0          0          0          0          0          0          -          -          -          -          -          -          
+TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bBmumu_L1MU11_2MU6 #947854469
+TrigSignatureMoniMT                                 INFO -- #947854469 Events          20         20         0          0          0          0          0          0          0          0          -          -          -          -          0          
+TrigSignatureMoniMT                                 INFO -- #947854469 Features                              0          0          0          0          0          0          0          0          -          -          -          -          
+TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bDimu2700_L1MU11_2MU6 #4293593869
+TrigSignatureMoniMT                                 INFO -- #4293593869 Events         20         20         0          0          0          0          0          0          0          0          -          -          -          -          0          
+TrigSignatureMoniMT                                 INFO -- #4293593869 Features                             0          0          0          0          0          0          0          0          -          -          -          -          
+TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bDimu_L1MU11_2MU6 #2381335347
+TrigSignatureMoniMT                                 INFO -- #2381335347 Events         20         20         0          0          0          0          0          0          0          0          -          -          -          -          0          
+TrigSignatureMoniMT                                 INFO -- #2381335347 Features                             0          0          0          0          0          0          0          0          -          -          -          -          
 TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6 #2504965945
 TrigSignatureMoniMT                                 INFO -- #2504965945 Events         20         20         0          0          0          0          0          0          0          0          -          -          -          -          0          
 TrigSignatureMoniMT                                 INFO -- #2504965945 Features                             0          0          0          0          0          0          0          0          -          -          -          -          
+TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bPhi_L1MU11_2MU6 #2079901197
+TrigSignatureMoniMT                                 INFO -- #2079901197 Events         20         20         0          0          0          0          0          0          0          0          -          -          -          -          0          
+TrigSignatureMoniMT                                 INFO -- #2079901197 Features                             0          0          0          0          0          0          0          0          -          -          -          -          
+TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bTau_L1MU11_2MU6 #1292401093
+TrigSignatureMoniMT                                 INFO -- #1292401093 Events         20         20         0          0          0          0          0          0          0          0          -          -          -          -          0          
+TrigSignatureMoniMT                                 INFO -- #1292401093 Features                             0          0          0          0          0          0          0          0          -          -          -          -          
 TrigSignatureMoniMT                                 INFO HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6 #1171632195
 TrigSignatureMoniMT                                 INFO -- #1171632195 Events         20         20         0          0          0          0          0          0          0          0          -          -          -          -          0          
 TrigSignatureMoniMT                                 INFO -- #1171632195 Features                             0          0          0          0          0          0          0          0          -          -          -          -          
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsDef.py
index c7e74de4f0ee..64b514870e3d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsDef.py
@@ -68,7 +68,10 @@ class BphysicsChainConfiguration(MuonChainConfiguration):
             'bJpsimumu' : 'dimu',
             'bUpsimumu' : 'dimu',
             'bBmumu'    : 'dimu',
-            'bDimu'     : 'dimu'
+            'bDimu'     : 'dimu',
+            'bDimu2700' : 'dimu',
+            'bPhi'      : 'dimu',
+            'bTau'      : 'dimu'
         }
 
         return topo_dict[the_topo]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
index c50070198743..31776fa54f7b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
@@ -123,6 +123,11 @@ def setupMenu():
         ChainProp(name='HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6', groups=BphysicsGroup),
         ChainProp(name='HLT_2mu10_bUpsimumu_L12MU10', groups=BphysicsGroup),
         ChainProp(name='HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6', groups=BphysicsGroup),
+        ChainProp(name='HLT_mu11_mu6_bBmumu_L1MU11_2MU6', groups=BphysicsGroup),
+        ChainProp(name='HLT_mu11_mu6_bDimu_L1MU11_2MU6', groups=BphysicsGroup),
+        ChainProp(name='HLT_mu11_mu6_bDimu2700_L1MU11_2MU6', groups=BphysicsGroup),
+        ChainProp(name='HLT_mu11_mu6_bPhi_L1MU11_2MU6', groups=BphysicsGroup),
+        ChainProp(name='HLT_mu11_mu6_bTau_L1MU11_2MU6', groups=BphysicsGroup),
     ]
     TriggerFlags.CombinedSlice.signatures = [
 #        ChainProp(name='HLT_e3_etcut1step_mu6fast_L1EM8I_MU10', l1SeedThresholds=['EM8I', 'MU10'], mergingStrategy='serial',stream=[PhysicsStream], groups=MultiElectronGroup),    #L1 item thresholds in wrong order (EM first, then MU)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 5301546672a0..84ef904afa5e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -220,7 +220,7 @@ MuonChainParts_Default = {
 #==========================================================
 # Bphysics
 #==========================================================
-AllowedTopos_Bphysics = ['bJpsimumu','bUpsimumu','bBmumu','bDimu']
+AllowedTopos_Bphysics = ['bJpsimumu','bUpsimumu','bBmumu','bDimu','bDimu2700','bPhi','bTau']
 
 # ---- Bphysics Dictinary of all allowed Values ----
 BphysicsChainParts = deepcopy(MuonChainParts)
-- 
GitLab