From 576af3319e7195cdc0634a5b39e59fbd5fdba949 Mon Sep 17 00:00:00 2001
From: Savanna Marie Shaw <savanna.marie.shaw@cern.ch>
Date: Wed, 15 Jan 2020 12:49:19 +0100
Subject: [PATCH] Fix bug in RoI creation for muon trigger isolation
Fixing a typo that was leading to creating the wrong RoIs for use in the isolation for the muon trigger (and also for part of the full scan and late muon triggers).
Also updating the muon only reference file since it's gotten rather out of date.
---
.../EventViewCreatorAlgorithmWithMuons.cxx | 8 +-
.../share/q221_RDOtoRDOTrig_mt1_build.ref | 12 +--
.../TrigUpgradeTest/share/slice_mu_mc.ref | 92 +++++++++----------
3 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithMuons.cxx b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithMuons.cxx
index 752d902796e..27f6e1a5246 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithMuons.cxx
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithMuons.cxx
@@ -116,10 +116,10 @@ StatusCode EventViewCreatorAlgorithmWithMuons::execute( const EventContext& cont
// parameters for RoI to record
reta = lateRoI->eta();
retap = lateRoI->etaPlus();
- retap = lateRoI->etaMinus();
+ retam = lateRoI->etaMinus();
rphi = lateRoI->phi();
rphip = lateRoI->phiPlus();
- rphip = lateRoI->phiMinus();
+ rphim = lateRoI->phiMinus();
}
else{
// Retrieve muons ...
@@ -133,10 +133,10 @@ StatusCode EventViewCreatorAlgorithmWithMuons::execute( const EventContext& cont
// parameters for RoI around muon
reta = muon->eta();
retap = muon->eta()+m_roiEtaWidth;
- retap = muon->eta()-m_roiEtaWidth;
+ retam = muon->eta()-m_roiEtaWidth;
rphi = muon->phi();
rphip = muon->phi()+m_roiPhiWidth;
- rphip = muon->phi()-m_roiPhiWidth;
+ rphim = muon->phi()-m_roiPhiWidth;
}
auto roi = new TrigRoiDescriptor(reta, retam, retap, rphi, rphim, rphip);
roisWriteHandle->push_back( roi );
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
index ac65d8bfc9f..e9465bb554b 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
@@ -140,8 +140,8 @@ TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 14 6 3 0 0
TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 8 8 6 6 5 5 0 5
TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 decisions 7 7 6 6 0
-TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 8 8 8 5 4 3 3 3
-TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 decisions 10 6 5 4 4
+TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 8 8 8 5 4 3 2 2
+TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 decisions 10 6 5 4 2
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 8 8 8 5 1 1 0 1
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 decisions 10 6 1 1 0
TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU208 8 8 5 1 1 1 1
@@ -154,16 +154,16 @@ TrigSignatureMoniMT INFO HLT_mu6_L1MU6
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 14 13 16 15 0
TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 10 10 10 10 10 10 0 10
TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 decisions 14 14 17 18 0
-TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 10 10 10 10 10 10 10 10
-TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 decisions 14 13 16 15 15
+TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 10 10 10 10 10 10 7 7
+TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 decisions 14 13 16 15 7
TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 10 10 10 0 10 0 0 10
TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 decisions 14 0 17 0 0
TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 4 4 4 4 4 4 0 4
TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 decisions 8 8 12 10 0
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 10 10 10 0 0 0 0 10
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 decisions 14 0 0 0 0
-TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 10 10 10 3 0 0 0 3
-TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 decisions 18 4 0 0 0
+TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 10 10 10 10 0 0 0 10
+TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 decisions 18 14 0 0 0
TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU208 8 8 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 decisions 10 0 0 0 0
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU100 0 0 0 0 0 0 0 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_mu_mc.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_mu_mc.ref
index d6a7b052e2a..2aec8d68bf8 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_mu_mc.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_mu_mc.ref
@@ -1,46 +1,46 @@
-TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 10 10 3 1 1 1 0 0 1
-TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 decisions 14 6 4 4 0 0
-TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 10 10 3 1 0 0 0 0 1
-TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 decisions 14 6 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 10 10 3 1 1 1 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 decisions 14 6 4 4 0 0
-TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 10 10 3 1 1 1 0 0 1
-TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 decisions 14 6 4 4 0 0
-TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 10 10 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 decisions 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 10 10 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 decisions 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 10 10 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 decisions 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 10 10 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 decisions 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 10 10 5 2 2 0 0 0 2
-TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 8 3 3 0 0 0
-TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 10 10 2 2 1 1 0 0 1
-TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 decisions 3 3 2 2 0 0
-TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 10 10 3 1 1 1 1 0 1
-TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 decisions 4 2 2 2 2 0
-TrigSignatureMoniMT INFO HLT_mu50_L1MU20 10 10 3 1 1 1 0 0 1
-TrigSignatureMoniMT INFO HLT_mu50_L1MU20 decisions 4 2 2 2 0 0
-TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU2010 10 3 1 1 1 1 0 1
-TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 decisions 4 2 2 2 2 0
-TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU2010 10 1 0 1 0 0 0 1
-TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 decisions 2 0 1 0 0 0
-TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 10 10 5 2 0 0 0 0 2
-TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 8 3 0 0 0 0
-TrigSignatureMoniMT INFO HLT_mu6_L1MU6 10 10 5 2 2 2 0 0 2
-TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 8 3 3 3 0 0
-TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 10 10 5 5 4 4 0 0 4
-TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 decisions 8 8 7 7 0 0
-TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 10 10 5 2 2 2 2 0 2
-TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 decisions 8 3 3 3 3 0
-TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 10 10 5 0 4 0 0 0 4
-TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 decisions 8 0 7 0 0 0
-TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 10 10 5 1 1 1 0 0 1
-TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 decisions 34 10 6 6 0 0
-TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 10 10 5 2 2 2 1 1 1
-TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 decisions 8 3 3 3 4 2
-TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 10 10 5 0 0 0 0 0 5
-TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 decisions 8 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU2010 10 3 0 1 0 0 0 1
-TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 decisions 4 0 1 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 20 20 4 2 2 1 0 1
+TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 decisions 16 8 8 4 0
+TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 20 20 4 3 0 0 0 3
+TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 decisions 16 12 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 20 20 4 3 3 3 2 0
+TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 decisions 16 12 18 16 2
+TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 20 20 4 3 3 3 0 3
+TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 decisions 16 12 18 16 0
+TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 20 20 13 7 4 0 0 4
+TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 17 8 4 0 0
+TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 20 20 6 6 5 5 0 5
+TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 decisions 7 7 6 6 0
+TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 20 20 8 5 4 3 2 2
+TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 decisions 10 6 5 4 2
+TrigSignatureMoniMT INFO HLT_mu50_L1MU20 20 20 8 5 1 1 0 1
+TrigSignatureMoniMT INFO HLT_mu50_L1MU20 decisions 10 6 1 1 0
+TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU2020 20 8 5 1 1 1 1
+TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 decisions 10 6 1 1 1
+TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU2020 20 1 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 decisions 2 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 20 20 13 13 0 0 0 13
+TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 17 16 0 0 0
+TrigSignatureMoniMT INFO HLT_mu6_L1MU6 20 20 13 13 11 11 0 11
+TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 17 16 17 16 0
+TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 20 20 13 13 11 11 0 11
+TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 decisions 17 17 18 21 0
+TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 20 20 13 13 11 11 7 7
+TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 decisions 17 16 17 16 7
+TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 20 20 13 0 11 0 0 11
+TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 decisions 17 0 18 0 0
+TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 20 20 7 7 4 4 0 4
+TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 decisions 14 14 12 12 0
+TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 20 20 13 0 0 0 0 13
+TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 decisions 17 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 20 20 11 11 0 0 0 11
+TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 decisions 18 15 0 0 0
+TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU2020 20 8 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 decisions 10 0 0 0 0
--
GitLab