From 14f01111c0e80e9999673938953f8343af91ce12 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Sat, 8 Jul 2023 20:35:06 +0200
Subject: [PATCH] 23.0-coverity-MuonMM_Cabling
23.0-coverity-MuonMM_Cabling
---
.../MuonMM_Cabling/src/MuonMM_CablingAlg.cxx | 4 ++++
.../MuonMM_Cabling/src/MuonMM_CablingAlg.h | 2 --
.../MuonTGC_Cabling/src/MuonTGC_CablingSvc.cxx | 11 ++++-------
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/MuonSpectrometer/MuonCablings/MuonMM_Cabling/src/MuonMM_CablingAlg.cxx b/MuonSpectrometer/MuonCablings/MuonMM_Cabling/src/MuonMM_CablingAlg.cxx
index 934a485df493..2f840e9182ac 100644
--- a/MuonSpectrometer/MuonCablings/MuonMM_Cabling/src/MuonMM_CablingAlg.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonMM_Cabling/src/MuonMM_CablingAlg.cxx
@@ -81,6 +81,10 @@ StatusCode MuonMM_CablingAlg::execute() {
}
const CondAttrListCollection* readCdo{*readHandle};
+ if (not readCdo){
+ ATH_MSG_ERROR("ReadCdo is null in MuonMM_CablingAlg::execute()");
+ return StatusCode::FAILURE;
+ }
writeHandle.addDependency(readHandle);
ATH_MSG_DEBUG("Size of CondAttrListCollection " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
ATH_MSG_DEBUG("Range of input is " << readHandle.getRange() << ", range of output is " << writeHandle.getRange());
diff --git a/MuonSpectrometer/MuonCablings/MuonMM_Cabling/src/MuonMM_CablingAlg.h b/MuonSpectrometer/MuonCablings/MuonMM_Cabling/src/MuonMM_CablingAlg.h
index a4bc3a99d1ac..a43ed5a72375 100644
--- a/MuonSpectrometer/MuonCablings/MuonMM_Cabling/src/MuonMM_CablingAlg.h
+++ b/MuonSpectrometer/MuonCablings/MuonMM_Cabling/src/MuonMM_CablingAlg.h
@@ -11,9 +11,7 @@
#define MUONMM_CABLING_MUONMM_CABLINGALG_H
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "AthenaKernel/IIOVDbSvc.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
-#include "GaudiKernel/IChronoStatSvc.h"
#include "MuonCablingData/MicroMega_CablingMap.h"
#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include "StoreGate/ReadCondHandleKey.h"
diff --git a/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/MuonTGC_CablingSvc.cxx b/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/MuonTGC_CablingSvc.cxx
index 750bca850e2b..ee50b4ec1da5 100644
--- a/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/MuonTGC_CablingSvc.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/MuonTGC_CablingSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -1011,12 +1011,9 @@ bool MuonTGC_CablingSvc::getReadoutIDfromElementID(const Identifier & elementID,
readoutSector = 3*readoutSector + 1;
}
- // rodID = 1..12
- if(subdetectorID == m_AsideId.value()) {
- rodID = readoutSector +1;
- } else {
- rodID = readoutSector +1;
- }
+
+ rodID = readoutSector +1;
+
return true;
}
--
GitLab