From 338d2dab3af4d10db36eed06f8ad5e8bd7d0d1e4 Mon Sep 17 00:00:00 2001
From: ecarquin <e.carquin.pphysics@gmail.com>
Date: Thu, 25 Jun 2020 15:13:17 +0200
Subject: [PATCH] Fix online mu value and histogram range
---
.../TrigTauMonitoring/src/HLTTauMonTool.cxx | 12 +++++-------
.../TrigTauMonitoring/src/HLTTauMonTool.h | 6 ++----
.../src/HLTTauMonTool_bookHistograms.cxx | 4 ++--
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
index 968dfc89e05..96ff5acb675 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/** @file HLTTauMonTool.cxx
@@ -244,7 +244,6 @@ StatusCode HLTTauMonTool::init() {
if(m_L1StringCondition=="allowResurrectedDecision") m_L1TriggerCondition=TrigDefs::Physics | TrigDefs::allowResurrectedDecision;
if(m_HLTStringCondition=="allowResurrectedDecision") m_HLTTriggerCondition=TrigDefs::Physics | TrigDefs::allowResurrectedDecision;
- ATH_CHECK( m_luminosityCondDataKey.initialize() );
return StatusCode::SUCCESS;
}
@@ -328,10 +327,6 @@ StatusCode HLTTauMonTool::fill() {
m_mu_offline = avg_mu;
ATH_MSG_DEBUG("offline mu "<<avg_mu);
}
- SG::ReadCondHandle<LuminosityCondData> lumiData (m_luminosityCondDataKey, Gaudi::Hive::currentContext());
- float avg_mu = lumiData->lbAverageInteractionsPerCrossing();
- m_mu_online = avg_mu;
- ATH_MSG_DEBUG("online mu "<<avg_mu);
m_muCut40Passed = (!m_domuCut40 || (m_domuCut40 && (m_mu_offline<40.)));
@@ -340,7 +335,10 @@ StatusCode HLTTauMonTool::fill() {
ATH_MSG_WARNING("Failed to retrieve EventInfo container, aborting!");
return StatusCode::SUCCESS;
}
- m_LB = evtInfo->lumiBlock();
+ m_LB = evtInfo->lumiBlock();
+
+ ATH_MSG_DEBUG("actual mu: "<<evtInfo->actualInteractionsPerCrossing() );
+ m_mu_online = evtInfo->actualInteractionsPerCrossing();
// fill true taus vectors
m_true_taus.clear();
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.h b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.h
index d4a5c955ee5..ca839c4344e 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.h
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.h
@@ -188,12 +188,10 @@ class HLTTauMonTool : public IHLTMonTool {
ToolHandle<TrigTauEmul::IHltEmulationTool> m_hltemulationTool;
ToolHandle<ILumiBlockMuTool> m_lumiBlockMuTool;
- SG::ReadCondHandleKey<LuminosityCondData> m_luminosityCondDataKey
- { this, "LuminosityCondDataKey", "LuminosityCondDataOnline", "" };
-// ToolHandle<ILuminosityTool> m_luminosityToolOnline;
+
float m_mu_offline;
int m_mu_online;
- int m_LB;
+ int m_LB;
///Name of the trigger items to be monitored.
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx
index 8af3ab872d9..71b897f1783 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx
@@ -121,8 +121,8 @@ void HLTTauMonTool::bookHistogramsForItem(const std::string & trigItem){
//Basic kinematic variables
addHistogram(new TH1F("hEFEt","EF Et;E_{T}[GeV];Nevents",50,0.0,100.0));
addHistogram(new TH1F("hEFEta","EF TrigCaloCluster Eta; #eta ; Nevents",26,-2.6,2.6));
- addHistogram(new TH1F("hEFNUM","Online mu; Online #mu ; Nevents",50,0,50));
- addHistogram(new TH2F("hEFNUMvsmu","Online vs offline mu; Online #mu ; Offline #mu", 70,0,70,70,0,70));
+ addHistogram(new TH1F("hEFNUM","Online mu; Online #mu ; Nevents",100,0,100));
+ addHistogram(new TH2F("hEFNUMvsmu","Online vs offline mu; Online #mu ; Offline #mu", 100,0,100,100,0,100));
addHistogram(new TH1F("hEFPhi","EF TrigCaloCluster Phi; #phi ; Nevents",16,-3.2,3.2));
addHistogram(new TH1F("hEFnTrack","EF number of tracks;number of tracks;Nevents",10,0,10));
addHistogram(new TH2F("hEFEtaVsPhi","EF TrigCaloCluster Eta vs Phi; #eta ; #phi ; Nevents",26,-2.6,2.6,16,-3.2,3.2));
--
GitLab