From 2263f28d3e9fcc8ab2804e4cdbaf0b5d5a571ea0 Mon Sep 17 00:00:00 2001 From: Debo <debottam.bakshi.gupta@cern.ch> Date: Sun, 17 Jan 2021 20:34:36 +0100 Subject: [PATCH 1/7] right l1 threshold to Jpsiee triggers and correcting indentation to other files Conflicts: Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py resolving conflicts --- .../src/TrigEgammaFastElectronFexMT.cxx | 8 ++++---- .../python/HLTMenuConfig/Menu/LS2_v1.py | 13 ++++++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronFexMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronFexMT.cxx index 05e487b098cb..e3cb62d7e4ac 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronFexMT.cxx +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronFexMT.cxx @@ -176,12 +176,12 @@ StatusCode TrigEgammaFastElectronFexMT::execute() { auto mon = Monitored::Group(m_monTool, caloPtMon, trackPtMon, caloTrackDEtaMon, caloTrackDPhiMon, etOverPtMon, caloTrackDEtaNoExtrapMon ); // Make Dummy Electron - xAOD::TrigElectron* trigDummyElec = new xAOD::TrigElectron(); + xAOD::TrigElectron* trigDummyElec = new xAOD::TrigElectron(); - ElementLink<xAOD::TrackParticleContainer> trackDummyEL = ElementLink<xAOD::TrackParticleContainer> (*tracks, 0); + ElementLink<xAOD::TrackParticleContainer> trackDummyEL = ElementLink<xAOD::TrackParticleContainer> (*tracks, 0); - trigDummyElecColl->push_back(trigDummyElec); - trigDummyElec->init( 0, + trigDummyElecColl->push_back(trigDummyElec); + trigDummyElec->init( 0, 0, 0, 0, clusEL, trackDummyEL); diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 8510e7ecbb98..f2242cc0dda9 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -146,7 +146,18 @@ def setupMenu(): # TnP triggers ChainProp(name='HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3', groups=MultiElectronGroup), - ChainProp(name='HLT_e20_lhmedium_e15_idperf_Zee_L12EM3', groups=MultiElectronGroup), #idperf leg + ChainProp(name='HLT_e20_lhmedium_e15_idperf_Zee_L12EM3', groups=MultiElectronGroup), #idperf leg + + ## Jpsiee triggers + ChainProp(name='HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7',l1SeedThresholds=['EM7','EM3'], groups=MultiElectronGroup), + ChainProp(name='HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7',l1SeedThresholds=['EM3','EM7'],groups=MultiElectronGroup), + ChainProp(name='HLT_e14_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM12',l1SeedThresholds=['EM12','EM3'],groups=MultiElectronGroup), + ChainProp(name='HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12',l1SeedThresholds=['EM3','EM12'],groups=MultiElectronGroup), + ChainProp(name='HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7',l1SeedThresholds=['EM7','EM3'],groups=MultiElectronGroup), + ChainProp(name='HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7',l1SeedThresholds=['EM3','EM7'],groups=MultiElectronGroup), + ChainProp(name='HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12',l1SeedThresholds=['EM12','EM3'],groups=MultiElectronGroup), + ChainProp(name='HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12',l1SeedThresholds=['EM3','EM12'],groups=MultiElectronGroup), + # for moving to PhysicsP1, ATR-21242 # ChainProp(name='HLT_2e17_etcut_L12EM15VHI', stream=[PhysicsStream], groups=MultiElectronGroup), -- GitLab From 888640abc251ff5d8e3e76819b3d541a1a22b8da Mon Sep 17 00:00:00 2001 From: Debo <debottam.bakshi.gupta@cern.ch> Date: Mon, 18 Jan 2021 15:40:47 +0100 Subject: [PATCH 2/7] updating references --- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 76 +++++++++++++++++++ .../share/ref_data_v1Dev_build.ref | 68 +++++++++++++++++ 2 files changed, 144 insertions(+) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 3cce0691a852..cf7abbbdaf97 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -570,6 +570,10 @@ HLT_e140_lhloose_L1EM22VHI: eventCount: 0 HLT_e140_lhloose_nod0_L1EM22VHI: eventCount: 0 +HLT_e14_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM12: + eventCount: 0 +HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12: + eventCount: 0 HLT_e17_lhloose_mu14_L1EM15VH_MU10: eventCount: 2 stepCounts: @@ -1076,6 +1080,34 @@ HLT_e5_lhtight_L1EM3: 2: 74 3: 43 4: 5 +HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12: + eventCount: 1 + stepCounts: + 0: 1 + 1: 1 + 2: 1 + 3: 1 + 4: 1 + stepFeatures: + 0: 4 + 1: 13 + 2: 3 + 3: 2 + 4: 2 +HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7: + eventCount: 2 + stepCounts: + 0: 2 + 1: 2 + 2: 2 + 3: 2 + 4: 2 + stepFeatures: + 0: 11 + 1: 31 + 2: 15 + 3: 9 + 4: 9 HLT_e5_lhtight_gsf_L1EM3: eventCount: 4 stepCounts: @@ -1118,6 +1150,22 @@ HLT_e5_lhtight_noringer_L1EM3: 2: 61 3: 36 4: 5 +HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12: + eventCount: 0 +HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7: + eventCount: 1 + stepCounts: + 0: 1 + 1: 1 + 2: 1 + 3: 1 + 4: 1 + stepFeatures: + 0: 3 + 1: 10 + 2: 4 + 3: 3 + 4: 3 HLT_e5_lhtight_noringer_nod0_L1EM3: eventCount: 4 stepCounts: @@ -1194,6 +1242,34 @@ HLT_e7_lhmedium_mu24_L1MU20: 6: 2 7: 2 8: 2 +HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7: + eventCount: 2 + stepCounts: + 0: 2 + 1: 2 + 2: 2 + 3: 2 + 4: 2 + stepFeatures: + 0: 23 + 1: 66 + 2: 22 + 3: 16 + 4: 16 +HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7: + eventCount: 1 + stepCounts: + 0: 1 + 1: 1 + 2: 1 + 3: 1 + 4: 1 + stepFeatures: + 0: 16 + 1: 50 + 2: 16 + 3: 12 + 4: 12 HLT_e9_lhvloose_mu20_mu8noL1_L1MU20: eventCount: 0 stepCounts: diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index c3fbdf4c3c49..c82fbdb531c8 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -322,6 +322,10 @@ HLT_e140_lhloose_L1EM22VHI: eventCount: 0 HLT_e140_lhloose_nod0_L1EM22VHI: eventCount: 0 +HLT_e14_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM12: + eventCount: 0 +HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12: + eventCount: 0 HLT_e17_lhloose_mu14_L1EM15VH_MU10: eventCount: 0 HLT_e17_lhvloose_L1EM15VH: @@ -532,6 +536,20 @@ HLT_e5_lhtight_L1EM3: 1: 17 2: 11 3: 8 +HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12: + eventCount: 0 + stepCounts: + 0: 1 + stepFeatures: + 0: 2 +HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7: + eventCount: 0 + stepCounts: + 0: 2 + 1: 1 + stepFeatures: + 0: 4 + 1: 6 HLT_e5_lhtight_gsf_L1EM3: eventCount: 0 stepCounts: @@ -568,6 +586,34 @@ HLT_e5_lhtight_noringer_L1EM3: 1: 20 2: 21 3: 10 +HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12: + eventCount: 1 + stepCounts: + 0: 1 + 1: 1 + 2: 1 + 3: 1 + 4: 1 + stepFeatures: + 0: 3 + 1: 5 + 2: 5 + 3: 2 + 4: 2 +HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7: + eventCount: 1 + stepCounts: + 0: 1 + 1: 1 + 2: 1 + 3: 1 + 4: 1 + stepFeatures: + 0: 3 + 1: 5 + 2: 5 + 3: 2 + 4: 2 HLT_e5_lhtight_noringer_nod0_L1EM3: eventCount: 0 stepCounts: @@ -598,6 +644,28 @@ HLT_e7_etcut_L1EM3: 3: 16 HLT_e7_lhmedium_mu24_L1MU20: eventCount: 0 +HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7: + eventCount: 0 + stepCounts: + 0: 1 + 1: 1 + stepFeatures: + 0: 4 + 1: 12 +HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7: + eventCount: 2 + stepCounts: + 0: 2 + 1: 2 + 2: 2 + 3: 2 + 4: 2 + stepFeatures: + 0: 6 + 1: 10 + 2: 12 + 3: 5 + 4: 5 HLT_e9_lhvloose_mu20_mu8noL1_L1MU20: eventCount: 0 HLT_eb_low_L1RD2_FILLED: -- GitLab From 6bdde4814fefd886aea1e428dfdb0a59b95eca47 Mon Sep 17 00:00:00 2001 From: Debo <debottam.bakshi.gupta@cern.ch> Date: Thu, 14 Jan 2021 16:20:30 +0100 Subject: [PATCH 3/7] Modifying ElectronDef.py to accommodate Jpsiee triggers Conflicts: Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py --- .../HLTMenuConfig/Egamma/ElectronDef.py | 23 ++++++++++++++++--- .../python/HLTMenuConfig/Menu/LS2_v1.py | 1 + 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py index 803be3e5d705..b17fa3e2e239 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py @@ -43,7 +43,7 @@ def precisionGSFElectronSequenceCfg( flags ): # this must be moved to the HypoTool file: -def diElectronMassComboHypoToolFromDict(chainDict): +def diElectronZeeMassComboHypoToolFromDict(chainDict): from TrigEgammaHypo.TrigEgammaHypoConf import TrigEgammaMassHypoTool name = chainDict['chainName'] monTool = GenericMonitoringTool("MonTool_"+name) @@ -55,6 +55,17 @@ def diElectronMassComboHypoToolFromDict(chainDict): tool.MonTool = monTool return tool +def diElectronJpsieeMassComboHypoToolFromDict(chainDict): + from TrigEgammaHypo.TrigEgammaHypoConf import TrigEgammaMassHypoTool + name = chainDict['chainName'] + monTool = GenericMonitoringTool("MonTool_"+name) + monTool.Histograms = [defineHistogram('MassOfAccepted', type='TH1F', path='EXPERT', title="Mass in accepted combinations [MeV]", xbins=75, xmin=0, xmax=150000)] + tool= TrigEgammaMassHypoTool(name) + tool.LowerMassElectronClusterCut = 1000 + tool.UpperMassElectronClusterCut = 15000 + monTool.HistPath = 'EgammaMassHypo/'+tool.getName() + tool.MonTool = monTool + return tool #---------------------------------------------------------------- # Class to configure chain #---------------------------------------------------------------- @@ -167,7 +178,10 @@ class ElectronChainConfiguration(ChainConfigurationBase): if "Zee" in self.chainName: stepName = "precision_topoelectron"+isocut - return self.getStep(5,stepName,sequenceCfgArray=[precisionElectronSequenceCfg], comboTools=[diElectronMassComboHypoToolFromDict]) + return self.getStep(5,stepName,sequenceCfgArray=[precisionElectronSequenceCfg], comboTools=[diElectronZeeMassComboHypoToolFromDict]) + elif "Jpsiee" in self.chainName: + stepName = "precision_topoelectron"+isocut + return self.getStep(5,stepName,sequenceCfgArray=[precisionElectronSequenceCfg], comboTools=[diElectronJpsieeMassComboHypoToolFromDict]) else: stepName = "precision_electron"+isocut return self.getStep(5,stepName,[ precisionElectronSequenceCfg]) @@ -179,7 +193,10 @@ class ElectronChainConfiguration(ChainConfigurationBase): if "Zee" in self.chainName: stepName = "precision_topoelectron_GSF"+isocut - return self.getStep(5,stepName,sequenceCfgArray=[precisionGSFElectronSequenceCfg], comboTools=[diElectronMassComboHypoToolFromDict]) + return self.getStep(5,stepName,sequenceCfgArray=[precisionGSFElectronSequenceCfg], comboTools=[diElectronZeeMassComboHypoToolFromDict]) + if "Jpsiee" in self.chainName: + stepName = "precision_topoelectron_GSF"+isocut + return self.getStep(5,stepName,sequenceCfgArray=[precisionGSFElectronSequenceCfg], comboTools=[diElectronJpsieeMassComboHypoToolFromDict]) else: stepName = "precision_electron_GSF"+isocut return self.getStep(5,stepName,[ precisionGSFElectronSequenceCfg]) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index f2242cc0dda9..8bfb23ef95a8 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -145,6 +145,7 @@ def setupMenu(): # TnP triggers + ## Zee triggers ChainProp(name='HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3', groups=MultiElectronGroup), ChainProp(name='HLT_e20_lhmedium_e15_idperf_Zee_L12EM3', groups=MultiElectronGroup), #idperf leg -- GitLab From c74947a7e5ed2816ab005ae041c42db506ecd11b Mon Sep 17 00:00:00 2001 From: Debo <debottam.bakshi.gupta@cern.ch> Date: Mon, 18 Jan 2021 17:23:35 +0100 Subject: [PATCH 4/7] Updating reference files --- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index cf7abbbdaf97..ce04437b6f23 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -1107,7 +1107,7 @@ HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7: 1: 31 2: 15 3: 9 - 4: 9 + 4: 7 HLT_e5_lhtight_gsf_L1EM3: eventCount: 4 stepCounts: @@ -1165,7 +1165,7 @@ HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7: 1: 10 2: 4 3: 3 - 4: 3 + 4: 2 HLT_e5_lhtight_noringer_nod0_L1EM3: eventCount: 4 stepCounts: @@ -1255,7 +1255,7 @@ HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7: 1: 66 2: 22 3: 16 - 4: 16 + 4: 13 HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7: eventCount: 1 stepCounts: @@ -1269,7 +1269,7 @@ HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7: 1: 50 2: 16 3: 12 - 4: 12 + 4: 10 HLT_e9_lhvloose_mu20_mu8noL1_L1MU20: eventCount: 0 stepCounts: -- GitLab From 28f95341817916876b35740249605b7f2f734444 Mon Sep 17 00:00:00 2001 From: Debo <debottam.bakshi.gupta@cern.ch> Date: Tue, 26 Jan 2021 16:36:59 +0100 Subject: [PATCH 5/7] Fixing the uppermasscut limit of Jpsi mass --- .../python/HLTMenuConfig/Egamma/ElectronDef.py | 2 +- .../TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py index b17fa3e2e239..faf897862fce 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py @@ -62,7 +62,7 @@ def diElectronJpsieeMassComboHypoToolFromDict(chainDict): monTool.Histograms = [defineHistogram('MassOfAccepted', type='TH1F', path='EXPERT', title="Mass in accepted combinations [MeV]", xbins=75, xmin=0, xmax=150000)] tool= TrigEgammaMassHypoTool(name) tool.LowerMassElectronClusterCut = 1000 - tool.UpperMassElectronClusterCut = 15000 + tool.UpperMassElectronClusterCut = 5000 monTool.HistPath = 'EgammaMassHypo/'+tool.getName() tool.MonTool = monTool return tool diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 3223ff614bd7..65f6b16ea15d 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -137,19 +137,21 @@ def setupMenu(): ChainProp(name='HLT_e140_lhloose_L1EM22VHI', groups=SingleElectronGroup), ChainProp(name='HLT_e140_lhloose_nod0_L1EM22VHI', groups=SingleElectronGroup), ChainProp(name='HLT_e300_etcut_L1EM22VHI', groups=SingleElectronGroup), - + ChainProp(name='HLT_2e17_lhvloose_L12EM3', stream=[PhysicsStream], groups=MultiElectronGroup), ChainProp(name='HLT_2e17_lhvloose_L12EM15VH', stream=[PhysicsStream], groups=MultiElectronGroup), ChainProp(name='HLT_2e17_lhvloose_L12EM15VHI', stream=[PhysicsStream], groups=MultiElectronGroup), ChainProp(name='HLT_2e24_lhvloose_L12EM20VH', stream=[PhysicsStream], groups=MultiElectronGroup), ChainProp(name='HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH', stream=[PhysicsStream], groups=MultiElectronGroup), - + # TnP triggers ## Zee triggers ChainProp(name='HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3', groups=MultiElectronGroup), + ChainProp(name='HLT_e26_lhtight_e15_etcut_Zee_L1EM22VHI', groups=MultiElectronGroup), ChainProp(name='HLT_e20_lhmedium_e15_idperf_Zee_L12EM3', groups=MultiElectronGroup), #idperf leg - + ChainProp(name='HLT_e26_lhtight_e15_idperf_Zee_L1EM22VHI', groups=MultiElectronGroup), #idperf leg + ## Jpsiee triggers ChainProp(name='HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7',l1SeedThresholds=['EM7','EM3'], groups=MultiElectronGroup), ChainProp(name='HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7',l1SeedThresholds=['EM3','EM7'],groups=MultiElectronGroup), -- GitLab From 1e1171370fad6b92618da502eb136ac2e4fad1e4 Mon Sep 17 00:00:00 2001 From: Debo <debottam.bakshi.gupta@cern.ch> Date: Tue, 26 Jan 2021 17:36:15 +0100 Subject: [PATCH 6/7] Adding 2 more Zee triggers - HLT_e26_lhtight_e15_etcut_Zee_L1EM22VHI - HLT_e26_lhtight_e15_idperf_Zee_L1EM22VHI --- .../TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 65f6b16ea15d..8570aee0ddd9 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -148,9 +148,9 @@ def setupMenu(): # TnP triggers ## Zee triggers ChainProp(name='HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3', groups=MultiElectronGroup), - ChainProp(name='HLT_e26_lhtight_e15_etcut_Zee_L1EM22VHI', groups=MultiElectronGroup), + ChainProp(name='HLT_e26_lhtight_e15_etcut_Zee_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'],groups=MultiElectronGroup), ChainProp(name='HLT_e20_lhmedium_e15_idperf_Zee_L12EM3', groups=MultiElectronGroup), #idperf leg - ChainProp(name='HLT_e26_lhtight_e15_idperf_Zee_L1EM22VHI', groups=MultiElectronGroup), #idperf leg + ChainProp(name='HLT_e26_lhtight_e15_idperf_Zee_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=MultiElectronGroup), #idperf leg ## Jpsiee triggers ChainProp(name='HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7',l1SeedThresholds=['EM7','EM3'], groups=MultiElectronGroup), -- GitLab From 32718d63914f26097fe566f9d5c06b43f944dc81 Mon Sep 17 00:00:00 2001 From: Debo <debottam.bakshi.gupta@cern.ch> Date: Wed, 27 Jan 2021 11:18:14 +0100 Subject: [PATCH 7/7] Updating references --- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 48 +++++++++++++++---- .../share/ref_data_v1Dev_build.ref | 10 ++++ 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 7379f5b1ed54..2ba1dded81e5 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -954,6 +954,34 @@ HLT_e26_lhtight_L1EM22VHI: 2: 4 3: 4 4: 4 +HLT_e26_lhtight_e15_etcut_Zee_L1EM22VHI: + eventCount: 1 + stepCounts: + 0: 1 + 1: 1 + 2: 1 + 3: 1 + 4: 1 + stepFeatures: + 0: 2 + 1: 11 + 2: 5 + 3: 2 + 4: 3 +HLT_e26_lhtight_e15_idperf_Zee_L1EM22VHI: + eventCount: 2 + stepCounts: + 0: 6 + 1: 4 + 2: 2 + 3: 2 + 4: 2 + stepFeatures: + 0: 13 + 1: 31 + 2: 15 + 3: 5 + 4: 6 HLT_e26_lhtight_gsf_L1EM22VHI: eventCount: 4 stepCounts: @@ -1192,7 +1220,7 @@ HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12: 4: 1 stepFeatures: 0: 4 - 1: 13 + 1: 12 2: 3 3: 2 4: 2 @@ -1206,10 +1234,10 @@ HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7: 4: 2 stepFeatures: 0: 11 - 1: 31 + 1: 29 2: 15 3: 9 - 4: 7 + 4: 9 HLT_e5_lhtight_gsf_L1EM3: eventCount: 4 stepCounts: @@ -1264,10 +1292,10 @@ HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7: 4: 1 stepFeatures: 0: 3 - 1: 10 + 1: 9 2: 4 3: 3 - 4: 2 + 4: 3 HLT_e5_lhtight_noringer_nod0_L1EM3: eventCount: 4 stepCounts: @@ -1368,10 +1396,10 @@ HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7: 4: 2 stepFeatures: 0: 23 - 1: 66 + 1: 65 2: 22 3: 16 - 4: 13 + 4: 4 HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7: eventCount: 1 stepCounts: @@ -1385,7 +1413,7 @@ HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7: 1: 50 2: 16 3: 12 - 4: 10 + 4: 2 HLT_e9_lhvloose_mu20_mu8noL1_L1MU20: eventCount: 0 stepCounts: @@ -2145,11 +2173,11 @@ HLT_j45_subjesgscIS_ftf_bdl1r70_split_L1J20: 1: 46 2: 19 HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20: - eventCount: 13 + eventCount: 14 stepCounts: 0: 19 1: 19 - 2: 13 + 2: 14 stepFeatures: 0: 19 1: 46 diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index ca192d452146..94ae5b815fbf 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -422,6 +422,16 @@ HLT_e26_lhtight_L1EM15VH: eventCount: 0 HLT_e26_lhtight_L1EM22VHI: eventCount: 0 +HLT_e26_lhtight_e15_etcut_Zee_L1EM22VHI: + eventCount: 0 +HLT_e26_lhtight_e15_idperf_Zee_L1EM22VHI: + eventCount: 0 + stepCounts: + 0: 1 + 1: 1 + stepFeatures: + 0: 2 + 1: 2 HLT_e26_lhtight_gsf_L1EM22VHI: eventCount: 0 HLT_e26_lhtight_gsf_ivarloose_L1EM22VHI: -- GitLab