Commit e463c797 authored by Atlas-Software Librarian's avatar Atlas-Software Librarian Committed by Graeme Stewart
Browse files

'CMakeLists.txt' (MuonCondData-00-09-04)

	* tagging MuonCondData-00-09-04
	* addressing coverity defects 11846-8 (again ...)

2015-05-05 Jochen Meyer
	* tagging MuonCondData-00-09-03
	* fixing order of inits causing compiler warnings in MuonCondSvc + MuonCondCool

2015-04-17 Jochen Meyer
	* tagging MuonCondData-00-09-02
	* addressing coverity defects 11846-8, 12059, 11906
parent fdd18f01
################################################################################
# Package: MuonCondData
################################################################################
# Declare the package name:
atlas_subdir( MuonCondData )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/CLIDSvc
Control/DataModel
Control/SGTools
Control/StoreGate
Database/AthenaPOOL/AthenaPoolUtilities
DetectorDescription/Identifier )
# Component(s) in the package:
atlas_add_library( MuonCondData
src/*.cxx
PUBLIC_HEADERS MuonCondData
LINK_LIBRARIES DataModel SGTools AthenaPoolUtilities Identifier StoreGateLib SGtests )
......@@ -91,7 +91,7 @@ namespace MuonCalib {
class CscCondDataCollection : public CscCondDataCollectionBase, public DataVector< CscCondData<data_type> > {
public:
CscCondDataCollection(SG::OwnershipPolicy own = SG::OWN_ELEMENTS)
: DataVector<CscCondData<data_type> >(own) {}
: DataVector<CscCondData<data_type> >(own), m_parDefault(data_type()) {}
virtual ~CscCondDataCollection() {}
//Reinitializes internal DataVector to point to empty entries, but
......
......@@ -33,7 +33,7 @@ class RpcConditionPar{
float m_stripid;
//float m_stripid;
std::string m_info_panel;
std::string m_info_strip;
//float m_panel;
......
......@@ -82,6 +82,28 @@ namespace MuonCalib{
void RpcCalibDBEntry::initData(std::string etaRec, std::string etaDet, std::string phiRec1, std::string phiRec2, std::string phiDet1, std::string phiDet2){
unsigned long int pos = 0;
std::string::size_type start = etaRec.find_first_not_of(" ",pos);
if(start == string::npos) {
std::cout << "RpcCalibDBEntry::initData -- problems extracting nRecEta -- crashing." << std::endl;
throw;
}
std::string::size_type stop = etaRec.find_first_of(" ",start+1);
if (stop == std::string::npos) stop = etaRec.size();
nRecEta = std::stoi(etaRec.substr(start,stop-start),nullptr);
etaRec.erase(pos,stop-pos);
pos = 0;
start = phiRec1.find_first_not_of(" ",pos);
if(start == string::npos) {
std::cout << "RpcCalibDBEntry::initData -- problems extracting nRecPhi1 -- crashing." << std::endl;
throw;
}
stop = phiRec1.find_first_of(" ",start+1);
if (stop == std::string::npos) stop = phiRec1.size();
nRecPhi1 = std::stoi(phiRec1.substr(start,stop-start),nullptr);
phiRec1.erase(pos,stop-pos);
istringstream etaRec_str;
istringstream etaDet_str;
istringstream phiRec1_str;
......@@ -96,16 +118,11 @@ namespace MuonCalib{
phiDet1_str.str(phiDet1);
phiDet2_str.str(phiDet2);
etaRec_str>>nRecEta;
etaDet_str>>nDetEta;
phiRec1_str>>nRecPhi1;
phiRec2_str>>nRecPhi2;
phiDet1_str>>nDetPhi1;
phiDet2_str>>nDetPhi2;
float eff, errEff, res1, res2, resX, errRes1, errRes2, errResX, time, errTime, noise, errNoise, noiseC, errNoiseC, cs, errCs;
// start with eta processing, 41 strips
......
......@@ -18,7 +18,7 @@
RpcConditionPar::RpcConditionPar()
{
// m_panel = 0;
//m_panel = 0;
//m_stripid = 0;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment