Merge branch 'clang.PixelDigitization-20170612' into 'master'

PixelDigitization: Fix clang warnings; comply with ATLAS naming conventions.

See merge request !2655
Former-commit-id: d79f9534

InnerDetector/InDetDigitization/PixelDigitization/src/ChargeCollProbSvc.cxx

@@ -76,10 +76,10 @@ StatusCode ChargeCollProbSvc::readProbMap(std::string fileE)
               double prob;
               sline>>xpos>>ypos>>prob;
               if (fileName.find("FEI4")!=std::string::npos){
-                probMapFEI4.insert( std::make_pair( std::make_pair( xpos , ypos ) , prob ) );
+                m_probMapFEI4.insert( std::make_pair( std::make_pair( xpos , ypos ) , prob ) );
                 ATH_MSG_DEBUG ("FEI4 inside xpos  "<<xpos<<"   ypos  "<<ypos<<"    prob  "<<prob);
               }else if(fileName.find("FEI3")!=std::string::npos){
-                probMapFEI3.insert( std::make_pair( std::make_pair( xpos , ypos ) , prob ) );
+                m_probMapFEI3.insert( std::make_pair( std::make_pair( xpos , ypos ) , prob ) );
                 ATH_MSG_DEBUG ("FEI3 inside xpos  "<<xpos<<"   ypos  "<<ypos<<"    prob  "<<prob);
               }else{
                 ATH_MSG_ERROR ("Please check name of Charge Coll Prob Maps! (should contain FEI3 or FEI4) ");
@@ -98,11 +98,11 @@ StatusCode ChargeCollProbSvc::printProbMap(std::string readout)
 {
  
   if(readout == "FEI4"){
-    for ( std::multimap<std::pair<int,int>, double >::iterator it = probMapFEI4.begin(); it != probMapFEI4.end(); ++it ) {
+    for ( std::multimap<std::pair<int,int>, double >::iterator it = m_probMapFEI4.begin(); it != m_probMapFEI4.end(); ++it ) {
       ATH_MSG_DEBUG ("read full probMap  FEI4 --- bin x "<<it->first.first<<"   bin y  "<<it->first.second<<"    prob  "<<it->second);
     }
   }else if(readout == "FEI3"){
-    for ( std::multimap<std::pair<int,int>, double >::iterator it = probMapFEI3.begin(); it != probMapFEI3.end(); ++it ) {
+    for ( std::multimap<std::pair<int,int>, double >::iterator it = m_probMapFEI3.begin(); it != m_probMapFEI3.end(); ++it ) {
       ATH_MSG_DEBUG ("read full probMap  FEI3 --- bin x "<<it->first.first<<"   bin y  "<<it->first.second<<"    prob  "<<it->second);
     }
   }else{
@@ -120,10 +120,10 @@ double ChargeCollProbSvc::getProbMapEntry( std::string readout, int binx, int bi
   double echarge;
  
   if (readout == "FEI4"){
-    std::multimap<  std::pair< int,int >, double >::const_iterator iter = probMapFEI4.find(doublekey);
+    std::multimap<  std::pair< int,int >, double >::const_iterator iter = m_probMapFEI4.find(doublekey);
     echarge = iter->second;
   }else if(readout == "FEI3"){
-    std::multimap<  std::pair< int,int >, double >::const_iterator iter = probMapFEI3.find(doublekey);
+    std::multimap<  std::pair< int,int >, double >::const_iterator iter = m_probMapFEI3.find(doublekey);
     echarge = iter->second;
   }else{
     ATH_MSG_ERROR ("No Map Entry available for the requested readout");

InnerDetector/InDetDigitization/PixelDigitization/src/ChargeCollProbSvc.h

@@ -60,8 +60,8 @@ private:
  
     std::string m_cc_prob_file_fei3;
     std::string m_cc_prob_file_fei4;
-    std::multimap< std::pair< int , int >, double >  probMapFEI4;
-    std::multimap< std::pair< int , int >, double >  probMapFEI3;
+    std::multimap< std::pair< int , int >, double >  m_probMapFEI4;
+    std::multimap< std::pair< int , int >, double >  m_probMapFEI3;
        
 };
  

InnerDetector/InDetDigitization/PixelDigitization/src/FEI4SimTool.cxx

@@ -67,7 +67,6 @@ void FEI4SimTool::process(SiChargedDiodeCollection &chargedDiodes,PixelRDO_Colle
 
     // Apply analogu threshold, timing simulation
     double th0  = m_pixelCalibSvc->getThreshold(diodeID);
-    double ith0 = m_pixelCalibSvc->getTimeWalk(diodeID);
 
     double threshold = th0+m_pixelCalibSvc->getThresholdSigma(diodeID)*CLHEP::RandGaussZiggurat::shoot(m_rndmEngine)+m_pixelCalibSvc->getNoise(diodeID)*CLHEP::RandGaussZiggurat::shoot(m_rndmEngine);
 

InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.cxx

@@ -355,11 +355,11 @@ StatusCode PixelDigitizationTool::mergeEvent() {
   // Digitize hits
   CHECK(digitizeEvent());
 
-  for (std::vector<SiHitCollection*>::iterator it = hitCollPtrs.begin();it!=hitCollPtrs.end();it++) {
+  for (std::vector<SiHitCollection*>::iterator it = m_hitCollPtrs.begin();it!=m_hitCollPtrs.end();it++) {
     (*it)->Clear();
     delete(*it);
   }
-  hitCollPtrs.clear();
+  m_hitCollPtrs.clear();
 
   return StatusCode::SUCCESS;
 }
@@ -388,7 +388,7 @@ StatusCode PixelDigitizationTool::processBunchXing(int bunchXing, SubEventIterat
     PileUpTimeEventIndex timeIndex(iEvt->time(),iEvt->index());
     SiHitCollection *hitCollPtr = new SiHitCollection(*seHitColl);
     m_timedHits->insert(timeIndex,hitCollPtr);
-    hitCollPtrs.push_back(hitCollPtr);
+    m_hitCollPtrs.push_back(hitCollPtr);
   }
 
   return StatusCode::SUCCESS;

InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.h

@@ -34,13 +34,13 @@ class PixelDigitizationTool : public PileUpToolBase {
   public:
     PixelDigitizationTool(const std::string &type, const std::string &name, const IInterface *pIID);
 
-    virtual StatusCode initialize();
-    virtual StatusCode processAllSubEvents();
-    virtual StatusCode finalize();
+    virtual StatusCode initialize() override;
+    virtual StatusCode processAllSubEvents() override;
+    virtual StatusCode finalize() override;
 
-    StatusCode prepareEvent(unsigned int);
+    virtual StatusCode prepareEvent(unsigned int) override;
     StatusCode digitizeEvent();
-    StatusCode mergeEvent();
+    virtual StatusCode mergeEvent() override;
     virtual StatusCode processBunchXing(int bunchXing, SubEventIterator bSubEvents, SubEventIterator eSubEvents) override final;
 
   protected:
@@ -52,7 +52,7 @@ class PixelDigitizationTool : public PileUpToolBase {
     PixelDigitizationTool(const PixelDigitizationTool&);
     PixelDigitizationTool &operator=(const PixelDigitizationTool&);
 
-    std::vector<SiHitCollection*> hitCollPtrs;
+    std::vector<SiHitCollection*> m_hitCollPtrs;
 
     SG::WriteHandle<PixelRDO_Container>     m_rdoContainer;
     SG::WriteHandle<InDetSimDataCollection> m_simDataColl;

InnerDetector/InDetDigitization/PixelDigitization/src/RD53SimTool.cxx

@@ -58,7 +58,6 @@ void RD53SimTool::process(SiChargedDiodeCollection &chargedDiodes,PixelRDO_Colle
 
     // Apply analogu threshold, timing simulation
     double th0  = m_pixelCalibSvc->getThreshold(diodeID);
-    double ith0 = m_pixelCalibSvc->getTimeWalk(diodeID);
 
     double threshold = th0+m_pixelCalibSvc->getThresholdSigma(diodeID)*CLHEP::RandGaussZiggurat::shoot(m_rndmEngine)+m_pixelCalibSvc->getNoise(diodeID)*CLHEP::RandGaussZiggurat::shoot(m_rndmEngine);