diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloFcal23Cells2RxMappingTool.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloFcal23Cells2RxMappingTool.h
index f031523932f2fe4a09681e7d571d9954e5190524..a7703d0f48e9fe1bd292d5084e373fa3a33d6aec 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloFcal23Cells2RxMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloFcal23Cells2RxMappingTool.h
@@ -14,8 +14,8 @@
// Mapping tool for Fcal 23 calo cells to receivers
//
-#ifndef _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_L1CALOFCAL23CELLS2RXMAPPINGTOOL_H_
-#define _TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_L1CALOFCAL23CELLS2RXMAPPINGTOOL_H_
+#ifndef TRIGT1CALOCALIBTOOLS_L1CALOFCAL23CELLS2RXMAPPINGTOOL_H
+#define TRIGT1CALOCALIBTOOLS_L1CALOFCAL23CELLS2RXMAPPINGTOOL_H
#include <map>
#include <vector>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloLArTowerEnergy.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloLArTowerEnergy.h
index da473b1128c3372d8f455454c6f6a89347105ac8..07f021914b0787f88d9d2b564c947a0d260e9777 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloLArTowerEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloLArTowerEnergy.h
@@ -70,7 +70,7 @@ private:
L1CaloCondSvc *m_condSvc;
const CaloLVL1_ID *m_lvl1Helper;
- const CaloIdManager *caloMgr;
+ const CaloIdManager *m_caloMgr;
const LArOnlineID *m_LArOnlineHelper;
CaloTriggerTowerService* m_ttService;
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h
index db7115d51d6b605ed217d27ce2cf3b654696c526..26f251ae47896cde62a3dad92aa0f3792384d16d 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloOfflineTriggerTowerTools.h
@@ -11,8 +11,8 @@
// ***************************************************************************/
-#ifndef TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_L1CALOOFFLINETRIGERTOWERTOOLS_H
-#define TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_L1CALOOFFLINETRIGERTOWERTOOLS_H
+#ifndef TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_L1CALOOFFLINETRIGGERTOWERTOOLS_H
+#define TRIGGER_TRIGT1_TRIGT1CALOCALIBTOOLS_L1CALOOFFLINETRIGGERTOWERTOOLS_H
#include "AsgTools/AsgTool.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloPprPlotManager.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloPprPlotManager.h
index 92acb69f4708f1a7e7b3abd49e57477957760c04..a07fd445e94ec45addc0bcd8fcbac47884df8081 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloPprPlotManager.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloPprPlotManager.h
@@ -220,7 +220,7 @@ protected:
std::map<unsigned int, TProfile*> m_map_offline_coolIDProfile_ValueVsLumi;
- bool isOnline;
+ bool m_isOnline;
bool m_firstRun;
bool m_doRunHistograms;
int m_ppmAdcMinValue;
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloLArTowerEnergy.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloLArTowerEnergy.cxx
index 35251b7d2f08a17a3f1316fc286a4268bf2e4cf2..d5af1c051594a66f5b799127b001e7379d95e5c2 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloLArTowerEnergy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloLArTowerEnergy.cxx
@@ -10,7 +10,7 @@ namespace LVL1{
asg::AsgTool( name ),
m_condSvc(nullptr),
m_lvl1Helper(nullptr),
- caloMgr(nullptr),
+ m_caloMgr(nullptr),
m_LArOnlineHelper(nullptr),
m_ttService(nullptr),
m_cells2tt("LVL1::L1CaloCells2TriggerTowers/L1CaloCells2TriggerTowers"),
@@ -30,14 +30,14 @@ namespace LVL1{
sc = service("L1CaloCondSvc", m_condSvc);
if(sc.isFailure()){ATH_MSG_ERROR( "Cannot access L1CaloCondSvc!" );return sc;}
- sc = detStore()->retrieve(caloMgr) ;
+ sc = detStore()->retrieve(m_caloMgr) ;
if(sc.isFailure()){ATH_MSG_ERROR( "Cannot access caloMgr");return sc;}
sc = detStore()->retrieve(m_LArOnlineHelper,"LArOnlineID") ;
if(sc.isFailure()){ATH_MSG_ERROR( "Cannot access LArOnlineID");return sc;}
//Use the CaloIdManager to get a pointer to an instance of the CaloLVL1_ID helper
- m_lvl1Helper = caloMgr->getLVL1_ID();
+ m_lvl1Helper = m_caloMgr->getLVL1_ID();
if(!m_lvl1Helper) {
ATH_MSG_ERROR( "Cannot access CaloLVL1_ID helper." );
return StatusCode::FAILURE;
@@ -83,13 +83,13 @@ namespace LVL1{
sc = m_ttTool->retrieveConditions();
if(!sc.isSuccess()) {
ATH_MSG_ERROR( "Cannot retrieve Conditions in L1TriggerTowerTool." );
- return StatusCode::RECOVERABLE;
+ return false;
}
// init trigger tower to cell mapping - needed each event?
if(!m_cells2tt->initCaloCellsTriggerTowers(caloCellContainer)) {
ATH_MSG_ERROR( "Can not initialize L1CaloCells2TriggerTowers with CaloCellContainer "<< m_caloCellContainerName );
- return StatusCode::RECOVERABLE;
+ return false;
}
Identifier TTid;
@@ -99,7 +99,7 @@ namespace LVL1{
mapSum::iterator it_map;
- LVL1::TriggerTower *tt;
+ const LVL1::TriggerTower *tt;
TriggerTowerCollection::const_iterator p_itTT = triggerTowerCollection.begin();
TriggerTowerCollection::const_iterator p_itTTEnd = triggerTowerCollection.end();
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprEtCorrelationPlotManager.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprEtCorrelationPlotManager.cxx
index f9dd0121d7f1e99102bb320b4eb93c0541e8f9a9..5e7fafd37237bf2ad68cdcdb6e3fb1198125b868 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprEtCorrelationPlotManager.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprEtCorrelationPlotManager.cxx
@@ -73,7 +73,7 @@ StatusCode L1CaloPprEtCorrelationPlotManager::getCaloCells()
const CaloCellContainer* caloCellContainer = 0;
- if (!isOnline){
+ if (!m_isOnline){
sc = m_storeGate->retrieve(caloCellContainer, m_caloCellContainerName);
if ( sc.isFailure() || !caloCellContainer) {
@@ -157,7 +157,7 @@ void L1CaloPprEtCorrelationPlotManager::loadTools()
{
StatusCode sc;
- if (isOnline) {
+ if (m_isOnline) {
sc = m_caloTool.retrieve();
if ( sc.isFailure()) {
*m_log<<MSG::WARNING<<"Unable to locate tool L1CaloMonitoringCaloTool" << endmsg;
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprFineTimePlotManager.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprFineTimePlotManager.cxx
index ce8b96984a167bd4e68c08b60a2e667e18e85ad6..a39ffe601f1297de5a8ef856ee05b8454985e67e 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprFineTimePlotManager.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprFineTimePlotManager.cxx
@@ -101,7 +101,7 @@ float L1CaloPprFineTimePlotManager::LArQuality(const xAOD::TriggerTower* trigTow
Identifier id(0);
- if(isOnline){
+ if(m_isOnline){
id = m_ttToolOnline->identifier(trigTower->eta(), trigTower->phi(), layer);
}else{
if(layer == 0) id = m_ttToolOffline->emID(trigTower->eta(),trigTower->phi());
@@ -229,7 +229,7 @@ void L1CaloPprFineTimePlotManager::loadTools()
{
StatusCode sc;
- if (isOnline) {
+ if (m_isOnline) {
sc = m_caloTool.retrieve();
if ( sc.isFailure()) {
*m_log<<MSG::WARNING<<"Unable to locate tool L1CaloMonitoringCaloTool" << endmsg;
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPlotManager.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPlotManager.cxx
index 048278b7641d1cd1d55953a950b8ee64a63aa92f..1e305401848c98dd2d3e26a803d053863ee8f54d 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPlotManager.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloPprPlotManager.cxx
@@ -73,7 +73,7 @@ L1CaloPprPlotManager::L1CaloPprPlotManager(ITHistSvc* histSvc,
m_h_offline_had_etaPhiValueRMS(0),
m_p_offline_em_valueVsRunNumber(0),
m_p_offline_had_valueVsRunNumber(0),
- isOnline(false),
+ m_isOnline(false),
m_firstRun(true),
m_doRunHistograms(doRunHistograms),
m_ppmAdcMinValue(ADC_cut),
@@ -125,7 +125,7 @@ L1CaloPprPlotManager::L1CaloPprPlotManager(ManagedMonitorToolBase* aMonObj,
m_h_offline_had_etaPhiValueRMS(0),
m_p_offline_em_valueVsRunNumber(0),
m_p_offline_had_valueVsRunNumber(0),
- isOnline(true),
+ m_isOnline(true),
m_firstRun(true),
m_doRunHistograms(false),
m_ppmAdcMinValue(ADC_cut),
@@ -158,7 +158,7 @@ void L1CaloPprPlotManager::Analyze(const EventInfo* evtInfo, const xAOD::Trigger
m_currentRunNo = evtInfo->event_ID()->run_number();
m_bunchCrossing = evtInfo->event_ID()->bunch_crossing_id();
- if (!isOnline && m_doRunHistograms)
+ if (!m_isOnline && m_doRunHistograms)
{
if (m_firstRun)
{
@@ -175,7 +175,7 @@ void L1CaloPprPlotManager::Analyze(const EventInfo* evtInfo, const xAOD::Trigger
if (sc.isFailure()) {*m_log << MSG::FATAL << "Could not book Run Histograms" << endmsg;}
}
}
- if (isOnline && this->isNewRun())
+ if (m_isOnline && this->isNewRun())
{
m_p_online_em_valueVsLumi = 0;
m_p_online_had_valueVsLumi = 0;
@@ -194,7 +194,7 @@ void L1CaloPprPlotManager::Analyze(const EventInfo* evtInfo, const xAOD::Trigger
//Check if the TriggerTowers are disabled or not before analysis
if (!channelDisabled)
{
- if ( isOnline) {
+ if ( m_isOnline) {
if ( trigTower->layer() == 0 ) { this->fillOnlineHistos(trigTower, coolID, Emlayer); }
if ( trigTower->layer() == 1 ) { this->fillOnlineHistos(trigTower, coolID, Hadlayer); }
}
@@ -687,7 +687,7 @@ void L1CaloPprPlotManager::fillDifferentialOfflineHistos(const xAOD::TriggerTowe
StatusCode L1CaloPprPlotManager::MakeSummary()
{
StatusCode sc;
- if ( !isOnline && m_doRunHistograms )
+ if ( !m_isOnline && m_doRunHistograms )
{
*m_log << MSG::INFO << "MakeSummary for " << m_monitoringName.data() << " plots" << endmsg;
sc = m_histoSvc->regHist(Form("/AANT/ADC/%s/run#%d/ppm_em_2d_profile_etaPhi_adc_%s",