From db66e18d2f84696bb8bc07eac649c1fd5774c623 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 19 May 2016 16:46:36 +0200
Subject: [PATCH] 'Comply with ATLAS naming conventions.'
(LArCalibTest-00-00-55)
* Tagging LArCalibTest-00-00-55.
* Comply with ATLAS naming conventions.
* Tagging LArCalibTest-00-00-54.
* LArTools -> LArCabling.
* Tagging LArCalibTest-00-00-53.
* src/LArReadHadDMCoeffFile.cxx: Fix cppcheck warnings (sscanf
field widths).
2015-06-25 Andreas Wildauer
* update to python/HECNoiseD3PDMaker.py:
- changed unsigned int array
self.iEvent = array('i',[0])
- to unsigned long
self.iEvent = array('L',[0])
because some event numbers were too large.
* tag: LArCalibTest-00-00-52
Former-commit-id: ee0b63008192cf64b25f0f10fd6595d1d306d5e6
---
.../LArTest/LArCalibTest/CMakeLists.txt | 4 +--
.../LArCalibTest/LArCablingChecker.h | 2 +-
.../LArTest/LArCalibTest/cmt/requirements | 2 +-
.../LArCalibTest/python/HECNoiseD3PDMaker.py | 2 +-
.../src/LArReadHadDMCoeffFile.cxx | 36 +++++++++----------
.../src/LArReadHadDMCoeffFile2.cxx | 10 +++---
6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt
index 6491195039f1..8bbc069caf8e 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
LArCalorimeter/LArIdentifier
LArCalorimeter/LArRawEvent
LArCalorimeter/LArRecConditions
- LArCalorimeter/LArTools
+ LArCalorimeter/LArCabling
PRIVATE
Calorimeter/CaloDetDescr
Control/StoreGate
@@ -26,7 +26,7 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( LArCalibTest
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES CaloConditions CaloIdentifier AthenaBaseComps GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArToolsLib CaloDetDescrLib StoreGateLib SGtests xAODEventInfo LArRawConditions PathResolver )
+ LINK_LIBRARIES CaloConditions CaloIdentifier AthenaBaseComps GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArCablingLib CaloDetDescrLib StoreGateLib SGtests xAODEventInfo LArRawConditions PathResolver )
# Install files from the package:
atlas_install_headers( LArCalibTest )
diff --git a/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArCablingChecker.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArCablingChecker.h
index 405a8e06c525..f5af1ff6c049 100755
--- a/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArCablingChecker.h
+++ b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArCablingChecker.h
@@ -6,7 +6,7 @@
#define LARCABLINGCHECKER
#include "AthenaBaseComps/AthAlgorithm.h"
#include "LArRawEvent/LArDigitContainer.h"
-#include "LArTools/LArCablingService.h"
+#include "LArCabling/LArCablingService.h"
//#include "CaloIdentifier/LArEM_ID.h"
#include "LArRecConditions/ILArBadChanTool.h"
#include "LArIdentifier/LArOnlineID.h"
diff --git a/LArCalorimeter/LArTest/LArCalibTest/cmt/requirements b/LArCalorimeter/LArTest/LArCalibTest/cmt/requirements
index 3e6e3f3e8a13..80dbd05ff013 100755
--- a/LArCalorimeter/LArTest/LArCalibTest/cmt/requirements
+++ b/LArCalorimeter/LArTest/LArCalibTest/cmt/requirements
@@ -6,7 +6,7 @@ use AtlasPolicy AtlasPolicy-*
use GaudiInterface GaudiInterface-* External
use AthenaBaseComps AthenaBaseComps-* Control
use LArRawEvent LArRawEvent-* LArCalorimeter
-use LArTools LArTools-* LArCalorimeter
+use LArCabling LArCabling-* LArCalorimeter
use LArRecConditions LArRecConditions-* LArCalorimeter
use CaloConditions CaloConditions-* Calorimeter
use CaloIdentifier CaloIdentifier-* Calorimeter
diff --git a/LArCalorimeter/LArTest/LArCalibTest/python/HECNoiseD3PDMaker.py b/LArCalorimeter/LArTest/LArCalibTest/python/HECNoiseD3PDMaker.py
index cbbf77df1e69..16494cafe966 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/python/HECNoiseD3PDMaker.py
+++ b/LArCalorimeter/LArTest/LArCalibTest/python/HECNoiseD3PDMaker.py
@@ -59,7 +59,7 @@ class HECNoiseD3PDMaker(PyAthena.Alg):
self.ntfile = TFile(self.NtupleFileName,"RECREATE")
self.hectree = TTree("HECNoise","HECNoise");
self.iRun = array('i',[0])
- self.iEvent = array('i',[0])
+ self.iEvent = array('L',[0])
self.iEventCount = array('i',[0])
self.fPrescale = {}
self.iTrigger = {}
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile.cxx
index 2642085586a9..00249bc01c2d 100755
--- a/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile.cxx
@@ -60,24 +60,24 @@ StatusCode LArReadHadDMCoeffFile::initDataFromFile(std::string hadDMCoeffFileNam
}
char line[1024], title[128];
- int m_offset = 0;
+ int offset = 0;
int indx_zone = 0, indx_parset = 0;
int nFrac, nEner, nEta, nPars;
while(fgets(line,1024,fin)) {
if(line[0] == '#' || line[0] == '\n' ) continue;
- int _izone, _is_on;
- if(sscanf(line,"%d %d %s\n",&_izone, &_is_on, title)!=3 || indx_zone != _izone) {
+ int izone, is_on;
+ if(sscanf(line,"%80d %80d %127s\n",&izone, &is_on, title)!=3 || indx_zone != izone) {
ATH_MSG_ERROR ( "Format error #1." );
fclose (fin);
return StatusCode::FAILURE;
}
CaloHadDMCoeff::HadDMArea dmArea;
- dmArea.m_is_on = _is_on;
+ dmArea.m_is_on = is_on;
dmArea.m_indx = indx_zone;
dmArea.m_title = title;
fgets(line,1024,fin);
- if(sscanf(line,"%d %f %f\n", &nFrac, &dmArea.m_MinFrac, &dmArea.m_MaxFrac)!=3 ||
+ if(sscanf(line,"%80d %80f %80f\n", &nFrac, &dmArea.m_MinFrac, &dmArea.m_MaxFrac)!=3 ||
nFrac<0 || nFrac>1000)
{
ATH_MSG_ERROR ( "Format error #2." );
@@ -85,7 +85,7 @@ StatusCode LArReadHadDMCoeffFile::initDataFromFile(std::string hadDMCoeffFileNam
return StatusCode::FAILURE;
}
fgets(line,1024,fin);
- if(sscanf(line,"%d %f %f\n", &nEner, &dmArea.m_MinEner, &dmArea.m_MaxEner)!=3 ||
+ if(sscanf(line,"%80d %80f %80f\n", &nEner, &dmArea.m_MinEner, &dmArea.m_MaxEner)!=3 ||
nEner < 0 || nEner > 1000)
{
ATH_MSG_ERROR ( "Format error #3." );
@@ -93,7 +93,7 @@ StatusCode LArReadHadDMCoeffFile::initDataFromFile(std::string hadDMCoeffFileNam
return StatusCode::FAILURE;
}
fgets(line,1024,fin);
- if(sscanf(line,"%d %f %f\n", &nEta, &dmArea.m_MinEta, &dmArea.m_MaxEta)!=3 ||
+ if(sscanf(line,"%80d %80f %80f\n", &nEta, &dmArea.m_MinEta, &dmArea.m_MaxEta)!=3 ||
nEta < 0 || nEta > 1000)
{
ATH_MSG_ERROR ( "Format error #4." );
@@ -101,7 +101,7 @@ StatusCode LArReadHadDMCoeffFile::initDataFromFile(std::string hadDMCoeffFileNam
return StatusCode::FAILURE;
}
fgets(line,1024,fin);
- if(sscanf(line,"%d \n", &nPars)!=1 || nPars < 0 || nPars> 1000) {
+ if(sscanf(line,"%80d \n", &nPars)!=1 || nPars < 0 || nPars> 1000) {
ATH_MSG_ERROR ( "Format error #5." );
fclose (fin);
return StatusCode::FAILURE;
@@ -109,8 +109,8 @@ StatusCode LArReadHadDMCoeffFile::initDataFromFile(std::string hadDMCoeffFileNam
dmArea.m_nPars = nPars;
for(int i_frac=0; i_frac<nFrac; i_frac++){
- int _iparset, _ifrac, _iener, _ieta;
- float _frac, _ener, _eta;
+ int iparset, ifrac, iener, ieta;
+ float frac, ener, eta;
for(int i_ener=0; i_ener<nEner; i_ener++){
for(int i_eta=0; i_eta<nEta; i_eta++){
fgets(line,1024,fin);
@@ -118,7 +118,7 @@ StatusCode LArReadHadDMCoeffFile::initDataFromFile(std::string hadDMCoeffFileNam
sLine = std::string(line);
std::istringstream es( sLine.c_str() );
- if ( es >> _iparset >> _ifrac >> _iener >> _ieta >> _frac >> _ener >> _eta) {
+ if ( es >> iparset >> ifrac >> iener >> ieta >> frac >> ener >> eta) {
CaloHadDMCoeff::HadDMCoeff pars;
pars.resize(nPars);
for(int i=0; i<nPars; i++) {
@@ -128,13 +128,13 @@ StatusCode LArReadHadDMCoeffFile::initDataFromFile(std::string hadDMCoeffFileNam
return StatusCode::FAILURE;
}
}
- if(_ifrac != i_frac || _iener != i_ener || _ieta != i_eta || (int)pars.size() != nPars){
+ if(ifrac != i_frac || iener != i_ener || ieta != i_eta || (int)pars.size() != nPars){
ATH_MSG_ERROR ( "Format error #7." );
fclose (fin);
return StatusCode::FAILURE;
}
- if(i_frac==0 && i_ener==0) dmArea.m_EtaBins.push_back(_eta);
+ if(i_frac==0 && i_ener==0) dmArea.m_EtaBins.push_back(eta);
m_data->addHadDMCoeff(pars);
pars.clear();
indx_parset++;
@@ -142,14 +142,14 @@ StatusCode LArReadHadDMCoeffFile::initDataFromFile(std::string hadDMCoeffFileNam
ATH_MSG_ERROR ( "Format error #8." );
}
} // i_eta
- if(i_frac == 0) dmArea.m_EnerBins.push_back(_ener);
+ if(i_frac == 0) dmArea.m_EnerBins.push_back(ener);
} // i_ener
- dmArea.m_FracBins.push_back(_frac);
+ dmArea.m_FracBins.push_back(frac);
}
- dmArea.m_offset = m_offset;
-// std::cout << "indx_zone: " << indx_zone << " m_offset:" << m_offset << std::endl;
+ dmArea.m_offset = offset;
+// std::cout << "indx_zone: " << indx_zone << " offset:" << offset << std::endl;
m_data->addHadDMArea(dmArea);
- m_offset += nFrac*nEner*nEta; // ofset for next DM area
+ offset += nFrac*nEner*nEta; // ofset for next DM area
indx_zone++;
}
fclose(fin);
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile2.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile2.cxx
index 9f6f7fb935d6..2aa40c0b3add 100755
--- a/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile2.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile2.cxx
@@ -70,8 +70,8 @@ StatusCode LArReadHadDMCoeffFile2::initDataFromFile(std::string hadDMCoeffFileNa
return StatusCode::FAILURE;
}
- int m_offset = 0;
- int m_indx = 0;
+ int offset = 0;
+ int indx = 0;
std::string sLine;
std::string sdummy;
@@ -118,7 +118,7 @@ StatusCode LArReadHadDMCoeffFile2::initDataFromFile(std::string hadDMCoeffFileNa
for(int i=0; i<ndim; i++){
length = length*v_dims[i].m_vBins.size();
}
- dmArea.m_offset = m_offset;
+ dmArea.m_offset = offset;
dmArea.m_length = length;
// calculation of dimension locator coefficient
for(int i_dim=0; i_dim<ndim; i_dim++){
@@ -138,8 +138,8 @@ StatusCode LArReadHadDMCoeffFile2::initDataFromFile(std::string hadDMCoeffFileNa
dmArea.m_dimEta = v_dims[3];
m_data->addHadDMArea(dmArea);
- m_offset += length; // ofset for next DM area
- m_indx++;
+ offset += length; // ofset for next DM area
+ indx++;
// putting zero parameters
CaloHadDMCoeff2::HadDMCoeff pars;
pars.resize(dmArea.m_nPars, 0.0);
--
GitLab