diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.cxx
index 5b0eb3ff9579b31d7de8e38b34bf6fbaea180cf3..69a891e538a3b7bede2fc68d7fccedb3922697b0 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.cxx
@@ -150,7 +150,7 @@ StatusCode SCT_ConditionsParameterCondAlg::execute() {
float parameters[3]{0.0, 0.0, 0.0};
float chipsum{0.0};
for (; channelItr != channelEnd; ++channelItr) {
- // Can get AttributeList from second (see http://lcgapp.cern.ch/doxygen/CORAL/CORAL_1_9_3/doxygen/html/classcoral_1_1_attribute_list.html)
+ // Can get AttributeList from second (see https://svnweb.cern.ch/trac/lcgcoral/browser/coral/trunk/src/CoralBase/CoralBase/AttributeList.h )
//short id = channelItr->second[2].data<short>(); //chip 0-11
float vthr{mVperDacBit * channelItr->second[10].data<short>()}; //threshold setting
short rcFunctionIndex{channelItr->second[15].data<short>()}; //response curve function
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterTestAlg.cxx
index dd3dc07d14e73b4c024cdb0529ed9191f0dd5458..4d99b74df446dab8501279f1fb127399a1685539 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterTestAlg.cxx
@@ -16,7 +16,6 @@
#include "SCT_ConditionsUtilities.h"
// Include Athena stuff
-#include "Identifier/Identifier.h"
#include "Identifier/IdentifierHash.h"
// Include Read Handle
@@ -26,14 +25,11 @@
#include <string>
#include <iostream>
#include <fstream>
-#include <cstdlib>
-using namespace std;
using namespace SCT_ConditionsAlgorithms;
SCT_ConditionsParameterTestAlg::SCT_ConditionsParameterTestAlg(const std::string& name, ISvcLocator* pSvcLocator ) :
- AthAlgorithm(name, pSvcLocator),
- m_currentEventKey{std::string("EventInfo")}
+ AthAlgorithm(name, pSvcLocator)
{ //nop
}
@@ -123,13 +119,13 @@ StatusCode SCT_ConditionsParameterTestAlg::finalize() {
// string xmlPath{CoveritySafe::getenv("XMLPATH")};
// size_t found{xmlPath.find(":")};
// if (found!=std::string::npos) xmlPath = xmlPath.substr(0, found);
- string stylePath{"./histo.xsl"};
- string filename{"./thresholds.xml"};
+ std::string stylePath{"./histo.xsl"};
+ std::string filename{"./thresholds.xml"};
ATH_MSG_INFO("Filename: " << filename);
ATH_MSG_INFO("------------");
- ofstream opFile{filename.c_str(), ios::out};
+ std::ofstream opFile{filename.c_str(), std::ios::out};
opFile << xmlHeader();
opFile << stylesheet(stylePath);
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterTestAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterTestAlg.h
index 8207e86e9288b535f0e70e5cb4c652e800b8ca90..b4eba81b80d407525ad660ed3838ced79a034a21 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterTestAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterTestAlg.h
@@ -36,7 +36,7 @@ class SCT_ConditionsParameterTestAlg : public AthAlgorithm {
StatusCode finalize() override; //!< Gaudi finaliser
private:
- SG::ReadHandleKey<xAOD::EventInfo> m_currentEventKey; //!< Current event
+ SG::ReadHandleKey<xAOD::EventInfo> m_currentEventKey{this, "EventInfoKey", "EventInfo", "Key of EventInfo"};
ToolHandle<ISCT_ConditionsParameterTool> m_conditionsParameterTool{this, "SCT_ConditionsParameterTool", "SCT_ConditionsParameterTool", "Tool to retrieve SCT conditions parameters"};
};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx
index 89a1000fe4159d6f82b087666509f41f792c600f..6ee5d48940948e93bc4058f02c8b1fd514108ecf 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx
@@ -227,7 +227,7 @@ StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData*
CondAttrListVec::const_iterator channelEnd{itr+nChips};
for (; channelItr!=channelEnd; ++channelItr) {
// Get chip id, config and masks and store as SCT_Chip object
- // Can get AttributeList from second (see http://lcgapp.cern.ch/doxygen/CORAL/CORAL_1_9_3/doxygen/html/classcoral_1_1_attribute_list.html)
+ // Can get AttributeList from second (see https://svnweb.cern.ch/trac/lcgcoral/browser/coral/trunk/src/CoralBase/CoralBase/AttributeList.h )
const short id{ run1 ? (channelItr->second[chipIndex].data<short>()) : static_cast<short>(channelItr->second[chipIndex].data<unsigned char>())};
const short config{run1 ? (channelItr->second[configIndex].data<short>()) : static_cast<short>(channelItr->second[configIndex].data<unsigned short>())};
const int mask0{ run1 ? (channelItr->second[mask0Index].data<int>()) : static_cast<int>(channelItr->second[mask0Index].data<unsigned int>())};
@@ -346,7 +346,7 @@ StatusCode SCT_ConfigurationCondAlg::fillModuleData(SCT_ConfigurationCondData* w
m_pHelper->get_other_side(m_cablingTool->getHashFromSerialNumber(truncatedSerialNumber), oppWaferHash);
const Identifier oppWaferId{m_pHelper->wafer_id(oppWaferHash)};
const Identifier moduleId{m_pHelper->module_id(waferId)};
- // Get AttributeList from second (see http://lcgapp.cern.ch/doxygen/CORAL/CORAL_1_9_3/doxygen/html/classcoral_1_1_attribute_list.html)
+ // Get AttributeList from second (see https://svnweb.cern.ch/trac/lcgcoral/browser/coral/trunk/src/CoralBase/CoralBase/AttributeList.h )
// and get module info from this. Bad module has a -ve group.
const short group{itr->second[groupIndex].data<short>()};
if (group<0) {
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.cxx
index a5c2a809f8c6fcffea0ac631ac1ea9aa22d4d835..ac0901c0c9d2c2d62557331afd576b0b7f6c0e17 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.cxx
@@ -16,13 +16,13 @@
// C++ includes
#include <string>
-SCT_ConfigurationConditionsTestAlg::SCT_ConfigurationConditionsTestAlg(const std::string& name, ISvcLocator* pSvcLocator ) :
- AthAlgorithm( name, pSvcLocator ),
+SCT_ConfigurationConditionsTestAlg::SCT_ConfigurationConditionsTestAlg(const std::string& name, ISvcLocator* pSvcLocator) :
+ AthAlgorithm(name, pSvcLocator),
m_sctId{nullptr}
{
}
-StatusCode SCT_ConfigurationConditionsTestAlg::initialize(){
+StatusCode SCT_ConfigurationConditionsTestAlg::initialize() {
ATH_MSG_INFO("in initialize()");
ATH_CHECK(m_configConditions.retrieve());
@@ -32,78 +32,77 @@ StatusCode SCT_ConfigurationConditionsTestAlg::initialize(){
return StatusCode::SUCCESS;
}
-StatusCode SCT_ConfigurationConditionsTestAlg::execute(){
+StatusCode SCT_ConfigurationConditionsTestAlg::execute() {
ATH_MSG_INFO("in execute()");
// Bad modules
- unsigned int nBadMods = m_configConditions->badModules()->size();
+ unsigned int nBadMods{m_configConditions->badModules()->size()};
// Bad links
- const std::map<IdentifierHash, std::pair<bool, bool> >* badLinks = m_configConditions->badLinks();
- std::map<IdentifierHash, std::pair<bool, bool> >::const_iterator linkItr(badLinks->begin());
- std::map<IdentifierHash, std::pair<bool, bool> >::const_iterator linkEnd(badLinks->end());
+ const std::map<IdentifierHash, std::pair<bool, bool>>* badLinks{m_configConditions->badLinks()};
+ std::map<IdentifierHash, std::pair<bool, bool>>::const_iterator linkItr{badLinks->begin()};
+ std::map<IdentifierHash, std::pair<bool, bool>>::const_iterator linkEnd{badLinks->end()};
- unsigned int nBadLink0(0), nBadLink1(0), nBadLinkBoth(0);
+ unsigned int nBadLink0{0}, nBadLink1{0}, nBadLinkBoth{0};
while (linkItr != linkEnd) {
- std::pair<bool, bool> status = (*linkItr).second;
- if (status.first == false && status.second == true ) ++nBadLink0;
- if (status.first == true && status.second == false) ++nBadLink1;
- if (status.first == false && status.second == false) ++nBadLinkBoth;
+ std::pair<bool, bool> status{(*linkItr).second};
+ if (status.first == false and status.second == true ) ++nBadLink0;
+ if (status.first == true and status.second == false) ++nBadLink1;
+ if (status.first == false and status.second == false) ++nBadLinkBoth;
++linkItr;
}
// Bad chips
- const std::map<Identifier, unsigned int>* badChips = m_configConditions->badChips();
- std::map<Identifier, unsigned int>::const_iterator chipItr(badChips->begin());
- std::map<Identifier, unsigned int>::const_iterator chipEnd(badChips->end());
+ const std::map<Identifier, unsigned int>* badChips{m_configConditions->badChips()};
+ std::map<Identifier, unsigned int>::const_iterator chipItr{badChips->begin()};
+ std::map<Identifier, unsigned int>::const_iterator chipEnd{badChips->end()};
- unsigned int nBadChips(0);
+ unsigned int nBadChips{0};
while (chipItr != chipEnd) {
- unsigned int status = (*chipItr).second;
- for (unsigned int i(0); i<12; i++) nBadChips += ((status & (1<<i)) == 0 ? 0 : 1);
+ unsigned int status{(*chipItr).second};
+ for (unsigned int i{0}; i<12; i++) nBadChips += ((status & (1<<i)) == 0 ? 0 : 1);
++chipItr;
}
// Bad strips
std::set<Identifier> badStripsAll;
m_configConditions->badStrips(badStripsAll);
- unsigned int nBadStrips = badStripsAll.size();
+ unsigned int nBadStrips{badStripsAll.size()};
// Bad strips (w/o bad modules and chips)
std::set<Identifier> badStripsExclusive;
m_configConditions->badStrips(badStripsExclusive, true, true);
- int nBadStripsExclusive = badStripsExclusive.size();
- int nBadStripsExclusiveBEC[] = {0,0,0};
+ int nBadStripsExclusive{badStripsExclusive.size()};
+ int nBadStripsExclusiveBEC[]{0,0,0};
- std::set<Identifier>::const_iterator stripItr(badStripsExclusive.begin());
- std::set<Identifier>::const_iterator stripEnd(badStripsExclusive.end());
+ std::set<Identifier>::const_iterator stripItr{badStripsExclusive.begin()};
+ std::set<Identifier>::const_iterator stripEnd{badStripsExclusive.end()};
while (stripItr != stripEnd) {
- int bec(m_sctId->barrel_ec(*stripItr));
+ int bec{m_sctId->barrel_ec(*stripItr)};
nBadStripsExclusiveBEC[(bec/2)+1] += 1;
++stripItr;
}
ATH_MSG_INFO("-----------------------------------------------------------------------");
- ATH_MSG_INFO("Number of bad modules = " << nBadMods );
- ATH_MSG_INFO("Number of bad link 0 = " << nBadLink0 );
- ATH_MSG_INFO("Number of bad link 1 = " << nBadLink1 );
- ATH_MSG_INFO("Number of bad link both = " << nBadLinkBoth );
- ATH_MSG_INFO("Number of bad chips = " << nBadChips );
- ATH_MSG_INFO("Number of bad strips = " << nBadStrips );
- ATH_MSG_INFO("Number of bad strips exclusive = " << nBadStripsExclusive);
- ATH_MSG_INFO("Number of bad strips exclusive (ECC, B, ECA) = "
+ ATH_MSG_INFO("Number of bad modules = " << nBadMods );
+ ATH_MSG_INFO("Number of bad link 0 = " << nBadLink0 );
+ ATH_MSG_INFO("Number of bad link 1 = " << nBadLink1 );
+ ATH_MSG_INFO("Number of bad link both = " << nBadLinkBoth );
+ ATH_MSG_INFO("Number of bad chips = " << nBadChips );
+ ATH_MSG_INFO("Number of bad strips = " << nBadStrips );
+ ATH_MSG_INFO("Number of bad strips exclusive = " << nBadStripsExclusive);
+ ATH_MSG_INFO("Number of bad strips exclusive (ECC, B, ECA) = "
<< nBadStripsExclusiveBEC[0] << ", "
<< nBadStripsExclusiveBEC[1] << ", "
<< nBadStripsExclusiveBEC[2] << ", ");
-
ATH_MSG_INFO("-----------------------------------------------------------------------");
return StatusCode::SUCCESS;
}
-StatusCode SCT_ConfigurationConditionsTestAlg::finalize(){
+StatusCode SCT_ConfigurationConditionsTestAlg::finalize() {
ATH_MSG_INFO("in finalize()");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsTestAlg.cxx
index 5d258a28226106e26acc1c5258562d647d2c9f4b..b2c79fd0f324a5b7bd666f482b35ca4dfd55d17e 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsTestAlg.cxx
@@ -13,19 +13,11 @@
#include "SCT_SensorsTestAlg.h"
-#include "Identifier/IdentifierHash.h"
-#include "Identifier/Identifier.h"
-
//Gaudi includes
#include "GaudiKernel/StatusCode.h"
// Include STL stuff
-#include <string>
-//for o/p to file
-#include <iostream>
-#include <cstdlib>
-
-using namespace std;
+#include <vector>
SCT_SensorsTestAlg::SCT_SensorsTestAlg(const std::string& name,
ISvcLocator* pSvcLocator) :