diff --git a/Calorimeter/CaloCondPhysAlgs/src/CaloCellCalcEnergyCorr.cxx b/Calorimeter/CaloCondPhysAlgs/src/CaloCellCalcEnergyCorr.cxx
index 053aeecaeb06e168ee8ca6fc69dafe30d4e5d516..9cbdbee7759a8983d78988564df645baa27d7930 100644
--- a/Calorimeter/CaloCondPhysAlgs/src/CaloCellCalcEnergyCorr.cxx
+++ b/Calorimeter/CaloCondPhysAlgs/src/CaloCellCalcEnergyCorr.cxx
@@ -191,7 +191,6 @@ StatusCode CaloCellCalcEnergyCorr::stop ATLAS_NOT_THREAD_SAFE ()
if(!m_hvlines.empty() && m_hvlines[0]>0) {
Identifier offId=calocell_id->cell_id(h);
std::vector<int> hvlineId = GetHVLines(hvdata, offId);
- //std::cout<<offId.getString()<<" : ";
int nfound=0;
float hvval=-1;
std::vector<int>::const_iterator poshv;
@@ -207,7 +206,6 @@ StatusCode CaloCellCalcEnergyCorr::stop ATLAS_NOT_THREAD_SAFE ()
}
}
}
- //std::cout << h << " " << value << std::endl;
setVec[0]=value;
flt->setData(h,0,setVec);
}//end loop over hash
diff --git a/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx b/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx
index 6b6d3246cb2c9d9f49fa22f6d70fdf3dd2a69928..4cbcfa44341726b9c52c6df0d93ee18ed5ff8be5 100644
--- a/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx
+++ b/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx
@@ -416,8 +416,6 @@
for (unsigned int iSector=hvManager_FCAL.beginSectorIndex(iSampling);iSector<hvManager_FCAL.endSectorIndex(iSampling);iSector++) {
const FCALHVModule& hvMod = hvManager_FCAL.getHVModule(iSide,iSector,iSampling);
- //std::cout << " FCAL HVModule side,sampling,sector " << iSide << " " << iSampling << " " << iSector << std::endl;
- //std::cout << " HV nominal " << HVnominal << std::endl;
float dphi=CaloPhiRange::twopi()/16;
if (iSampling==1) dphi=CaloPhiRange::twopi()/8.;
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/AccMap.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/AccMap.cxx
index 479ce1c36b02e631ce48851d4fa2c9c64bcd367c..1f4e0fdc8aa129a68feda511820f6a67926daaeb 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/AccMap.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/AccMap.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "AccMap.h"
@@ -43,7 +43,6 @@ AccMap::AccMap()
//fileLocation=larLocation+"/calo_data/"+filename;
fileLocation=larLocation+"/"+filename;
#endif
- // std::cout << " try to open map " << fileLocation << std::endl;
CurrMap* cm = new CurrMap(fileLocation,xnorm);
int code=10*ifold+iregion;
m_theMap[code]=cm;
@@ -66,7 +65,6 @@ AccMap::AccMap()
//fileLocation=larLocation+"/calo_data/"+filename;
fileLocation=larLocation+"/"+filename;
#endif
- // std::cout << " try to open map " << fileLocation << std::endl;
CurrMap* cm = new CurrMap(fileLocation,xnorm);
int code=10*(20+istr)+iregion;
m_theMap[code]=cm;
@@ -98,7 +96,6 @@ CurrMap* AccMap::GetMap(int ifold, int region, int sampling, int eta) const
CurrMap* AccMap::GetMap(int ifold, int ielecregion) const
{
const int code=10*ifold+ielecregion;
- // std::cout << " code is " << code << std::endl;
const auto mapIter = m_theMap.find(code);
if (mapIter != m_theMap.end())
return mapIter->second;
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/CurrMap.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/CurrMap.cxx
index 8279a740dc654e7f042d83b6a188c5c58f73d079..db032a17977447c1335876766fbdd998ff0c7665 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/CurrMap.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/CurrMap.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "CurrMap.h"
@@ -39,8 +39,6 @@ CurrMap::CurrMap(std::string filename,double xnorm)
if(m_nx>0 && m_ny>0 && m_nx<10000 && m_ny<10000) {//coverity issue. This is a tainted variable protection, 10000 can be changed if required.
m_dx = (m_xmax-m_xmin)/((float) m_nx);
m_dy = (m_ymax-m_ymin)/((float) m_ny);
- //std::cout << " nx,xmin,xmax,ny,ymin,ymax " << m_nx << " " << m_xmin << " " << m_xmax << " "
- // << m_ny << " " << m_ymin << " " << m_ymax << std::endl;
m_gap = new float[m_nx*m_ny];
m_curr0 = new float[m_nx*m_ny];
@@ -66,7 +64,6 @@ CurrMap::CurrMap(std::string filename,double xnorm)
m_curr0[iy*m_nx+ix]=cur1/m_norm;
m_curr1[iy*m_nx+ix]=cur2/m_norm;
m_curr2[iy*m_nx+ix]=cur3/m_norm;
- // std::cout << "read " << ix << " " << iy << " " << m_curr0[iy*m_nx+ix] << std::endl;
}
}
}
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.cxx
index 9d7b8179c86652d3633b57b0ad7578217c1e4ce5..e693994b06ca3a40420c00f28ed50cda9b6fa8eb 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.cxx
@@ -468,16 +468,9 @@ G4bool LArBarrelCalculator::Process(const G4Step* step, std::vector<LArHitData>&
// HV extrapolation
double current;
double hv=m_hv[ipm][ielec][ieta][iside];
- // std::cout << " etaBin,phiBin " << etaBin << " " << phiBin << std::endl;
- // std::cout << " ipm,ielec,ieta,iside " << ipm << " " << ielec << " " << ieta
- // << " " << iside << std::endl;
- // std::cout << " hv " << hv << std::endl;
- // std::cout << " current0,current1,current2 " << current0 << " " << current1
- // << " " << current2 << std::endl;
if (hv>1995.) current=current0;
else if (hv>5.) current=ScaleHV(hv,current0,current1,current2);
else current=0.;
- // std::cout << " current " << current << std::endl;
// extrapolation for non nominal gap (allows to include sagging effect)
// i ~ (gap/gap2)**1.3
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeAbsorbers.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeAbsorbers.cxx
index 214e155fe6151ca23da0e1f8e458f19f0b6a930d..03d0946776798c3745be91d676f96ab5de8d5b0b 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeAbsorbers.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeAbsorbers.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArCoudeAbsorbers.h"
@@ -36,19 +36,11 @@ LArCoudeAbsorbers::LArCoudeAbsorbers(std::string strDetector)
}
m_filled=false;
- // std::cout << " *** List of Fold Absorbers " << std::endl;
for (int stackid=0; stackid<15; stackid++) {
for (int cellid=0; cellid<1024; cellid++) {
m_xcent[cellid][stackid] = XCentCoude(stackid,cellid);
m_ycent[cellid][stackid] = YCentCoude(stackid,cellid);
m_phirot[cellid][stackid] = PhiRot(stackid,cellid);
- // std::cout << "cell,stack,x,y,phirot "
- // << cellid << " "
- // << stackid << " "
- // << m_xcent[cellid][stackid] << " "
- // << m_ycent[cellid][stackid] << " "
- // << m_phirot[cellid][stackid]
- // <<std::endl;
}
}
m_filled=true;
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeElectrodes.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeElectrodes.cxx
index 01b24c6833f8a736c986f668e663faeb5647f19d..7e25af5ef357f2ed154ce2f08edfd16a9d38c16a 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeElectrodes.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArCoudeElectrodes.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArCoudeElectrodes.h"
@@ -35,19 +35,11 @@ LArCoudeElectrodes::LArCoudeElectrodes(std::string strDetector)
}
}
m_filled=false;
- // std::cout << " *** List of fold electrodes " << std::endl;
for (int stackid=0; stackid<15; stackid++) {
for (int cellid=0; cellid<1024; cellid++) {
m_xcent[cellid][stackid] = XCentCoude(stackid,cellid);
m_ycent[cellid][stackid] = YCentCoude(stackid,cellid);
m_phirot[cellid][stackid] = PhiRot(stackid,cellid);
- // std::cout << "cell,stack,x,y,phirot "
- // << cellid << " "
- // << stackid << " "
- // << m_xcent[cellid][stackid] << " "
- // << m_ycent[cellid][stackid] << " "
- // << m_phirot[cellid][stackid]
- // <<std::endl;
}
}
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightAbsorbers.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightAbsorbers.cxx
index 56db63f5ab60383d0322dfdea69c24b8aa9bb6b3..484ddd7ac8d2c8fa611a74957b890636b7971912 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightAbsorbers.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightAbsorbers.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArStraightAbsorbers.h"
@@ -36,7 +36,6 @@ LArStraightAbsorbers::LArStraightAbsorbers(std::string strDetector)
strDetector+"::LAr::EMB::ThinAbs::Straight");
}
m_filled=false;
- // std::cout << " *** List of Straight absorbers " << std::endl;
for (int stackid=0; stackid<14; stackid++) {
for (int cellid=0; cellid<1024; cellid++) {
m_xcent[cellid][stackid] = XCentAbs(stackid,cellid);
@@ -45,15 +44,6 @@ LArStraightAbsorbers::LArStraightAbsorbers(std::string strDetector)
m_cosu[cellid][stackid] = cos(slant);
m_sinu[cellid][stackid] = sin(slant);
m_halflength[cellid][stackid] = HalfLength(stackid,cellid);
- // std::cout << "cell,stack,x,y,slant,HalfL "
- // << cellid << " "
- // << stackid << " "
- // << m_xcent[cellid][stackid] << " "
- // << m_ycent[cellid][stackid] << " "
- // << slant << " "
- // << m_halflength[cellid][stackid]
- // <<std::endl;
-
}
}
m_filled=true;
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightElectrodes.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightElectrodes.cxx
index b55255902d57e430fb30dc214e379016c743e210..a7f5285040985b5f67d8e281b83b7a07b49ccf04 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightElectrodes.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightElectrodes.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArStraightElectrodes.h"
@@ -34,7 +34,6 @@ LArStraightElectrodes::LArStraightElectrodes(std::string strDetector)
s_theElectrodes=new PhysicalVolumeAccessor(strDetector+"::LAr::EMB::STAC",
strDetector+"::LAr::EMB::Electrode::Straight");
}
- // std::cout << "*** List of StraightElectrodes " << s_theElectrodes << std::endl;
m_filled=false;
for (int stackid=0; stackid<14; stackid++) {
for (int cellid=0; cellid<1024; cellid++) {
@@ -44,14 +43,6 @@ LArStraightElectrodes::LArStraightElectrodes(std::string strDetector)
m_cosu[cellid][stackid] = cos(slant);
m_sinu[cellid][stackid] = sin(slant);
m_halflength[cellid][stackid] = HalfLength(stackid,cellid);
- // std::cout << "cell,stack,x,y,slant,HalfL "
- // << cellid << " "
- // << stackid << " "
- // << m_xcent[cellid][stackid] << " "
- // << m_ycent[cellid][stackid] << " "
- // << slant << " "
- // << m_halflength[cellid][stackid]
- // <<std::endl;
}
}
m_filled=true;
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/MapEta.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/MapEta.cxx
index e66cb189387029fb06906ba14634760a9d78d71c..f62105b1cc6e075d1621ad8e0027e6f37371fbbb 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/MapEta.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/MapEta.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MapEta.h"
@@ -70,7 +70,6 @@ void MapEta::Initialize(int isampling)
{
in>>m_nx>>m_xmin>>m_xmax>>m_ny>>m_ymin>>m_ymax;
if(m_nx>0 && m_ny>0 && m_nx<10000 && m_ny<10000){//coverity issue. This is a tainted variable protection, 10000 can be changed if required.
- //std::cout<<"nx"<<";"<<"ny="<<m_nx<<";"<<m_ny<<std::endl;
m_deltax=(m_xmax-m_xmin)/((float) m_nx);
m_deltay=(m_ymax-m_ymin)/((float) m_ny);
// what is written as xmax in the map is x of last point + delta x
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/PhysicalVolumeAccessor.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/PhysicalVolumeAccessor.cxx
index 41a9f28d524433e890678d1090f16a047ed736f0..621e3c05a6cef5bf9bff63e779002c5d9d8342fd 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/PhysicalVolumeAccessor.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/PhysicalVolumeAccessor.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "PhysicalVolumeAccessor.h"
@@ -16,8 +16,6 @@ G4LogicalVolume* PhysicalVolumeAccessor::GetLV(std::string name)
if (name==lname)
return (lvs->operator[](i));
}
- // std::cout<<"PhysicalVolumeAccessor::GetLV Warning!!! Volume "<<name
- // <<" not found!!! returning nullptr"<<std::endl;
return nullptr;
}
@@ -48,8 +46,6 @@ const G4VPhysicalVolume* PhysicalVolumeAccessor::GetPhysicalVolume(int icopy) co
return physVolIter->second;
else
{
- // std::cout<<"Physical Volume copy "<<icopy<<" not found in"
- // <<m_theLogicalVolume->GetName()<<"!!! return nullptr"<<std::endl;
return nullptr;
}
}
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.cc b/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.cc
index 416f9b29703687eca07ef8e238af823149ba0940..591dd6675f1b3b7fbeb3622d0abd1ef79632bbe9 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// EnergyCalculator
@@ -318,7 +318,6 @@ StatusCode EnergyCalculator::initialize()
const std::string A0 = A0STR.str();
const std::string colName = "ZIW" + A0;
ziw[i] = (*emecSamplingSep)[0]->getDouble(colName)*CLHEP::cm;
- // cout<<"i,ziw= "<<i<<" "<<ziw[i]<<endl;
}
for(int i = 0; i < 44; i ++){
std::ostringstream A0STR;
@@ -326,7 +325,6 @@ StatusCode EnergyCalculator::initialize()
const std::string A0 = A0STR.str();
const std::string colName = "ZSEP12" + A0;
zsep12[i] = (*emecSamplingSep)[0]->getDouble(colName)*CLHEP::cm;
- // cout<<"i,zsep12= "<<i<<" "<<zsep12[i]<<endl;
}
for(int i = 0; i < 22; i ++){
std::ostringstream A0STR;
@@ -334,7 +332,6 @@ StatusCode EnergyCalculator::initialize()
const std::string A0 = A0STR.str();
const std::string colName = "ZSEP23" + A0;
zsep23[i] = (*emecSamplingSep)[0]->getDouble(colName)*CLHEP::cm;
- // cout<<"i,zsep23= "<<i<<" "<<zsep23[i]<<endl;
}
m_ElectrodeFanHalfThickness = LArWheelCalculator::GetFanHalfThickness(LArG4::InnerElectrodWheel);
@@ -544,9 +541,6 @@ G4double EnergyCalculator::CalculateChargeCollection(
G4double Barret_PhiStart) const
// ****************************************************************************
{
- // std::cout<<"*** CalculateChargeCollection is called, a_energy="<<a_energy
- // <<std::endl;
-
ATH_MSG_DEBUG("starting CalculateChargeCollection:"
<< "a_energy = " << a_energy
<< ", startPoint = " << MSG_VECTOR(a_startPoint)
@@ -892,30 +886,22 @@ G4bool EnergyCalculator::FindIdentifier_Default(
if(pinLocal.z() > lwc()->GetWheelThickness()-zEndofC9e19 &&
pinLocal.z() <= lwc()->GetWheelThickness()-zSepofC9e18 &&
pinLocal.perp() < r0aofC9e18 ) {
- // G4cout<<" Skip of Hit in aC9e18"<<" r="<<pinLocal.perp()<<
- // " zinWheel="<<pinLocal.z()<<G4endl;
validhit=false;
}
if(pinLocal.z() > lwc()->GetWheelThickness()-zSepofC9e18 &&
pinLocal.perp() <
r0cofC9e18+txofC9e18*(pinLocal.z()-(lwc()->GetWheelThickness()-zSepofC9e18))){
- // G4cout<<" Skip of Hit in cC9e18"<<" r="<<pinLocal.perp()<<
- // " zinWheel="<<pinLocal.z()<<G4endl;
validhit=false;
}
break;
case 19:
if(pinLocal.z() > lwc()->GetWheelThickness()-zEndofC9e19) {
- // G4cout<<" Skip of Hit in z crack C9e19"<<" r="<<pinLocal.perp()<<
- // " zinWheel="<<pinLocal.z()<<G4endl;
validhit=false;
}
if(DistanceToEtaLine( pforcell, eta_mid) < DistMinatEdgeinCrack) {
- // G4cout<<" Skip of Hit in eta crack of C9e19"<<
- // " r="<<pinLocal.perp()<< " zinWheel="<<pinLocal.z()<<G4endl;
validhit=false;
}
break;
@@ -998,18 +984,11 @@ G4bool EnergyCalculator::FindIdentifier_Default(
if(cnew >= 0 && cnew <= 10 ){
- /* G4cout<<" edep in HV bus: old:comp="<<c+1<<" sampl="<<sampling<<
- " eta="<<etaBin<<" reg="<<region
- <<G4endl;*/
-
c=cnew;
compartment = c + 1;
sampling = s_geometry[c].sampling;
region = s_geometry[c].region;
etaBin = G4int(eta * s_geometry[c].etaScale - s_geometry[c].etaOffset);
- /* G4cout<<" edep in HV bus: new:comp="<<c+1<<" sampl="<<sampling<<
- " eta="<<etaBin<<" reg="<<region
- <<G4endl;*/
}
//=== end of edge and HV bus treatment================
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/GetCurrent1.cc b/LArCalorimeter/LArG4/LArG4EC/src/GetCurrent1.cc
index f668a8e15b57ed66523bb0a1f62ed31f36c40b43..dbef82c228787cc386f92af324d5bbb7391cd4f0 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/GetCurrent1.cc
+++ b/LArCalorimeter/LArG4/LArG4EC/src/GetCurrent1.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include <cassert>
@@ -37,7 +37,6 @@ G4int LArG4::EC::EnergyCalculator::_getIRlayerA(G4double fold_angle_deg) const {
break;
}
}
- //std::cout << "\tirlayer: " << irlayer << ", R " << R << std::endl;
assert(irlayer >= 0 && irlayer < n_layers - 1);
return irlayer;
}
@@ -69,7 +68,6 @@ G4double LArG4::EC::EnergyCalculator::_interpolateCurrentSubStep1(G4double rfor
const G4double a_e = elc()->AmplitudeOfSurface(Pe, side_dte, Pe_fan);
const G4double a_a = lwc()->AmplitudeOfSurface(Pa, side_dta, Pa_fan);
- //std::cout << "\ta_e: " << a_e << ", a_a: " << a_a << std::endl;
const G4double x_e = fabs(Pe.x() - a_e);
const G4double x_a = fabs(Pa.x() - a_a);
@@ -87,7 +85,6 @@ G4double LArG4::EC::EnergyCalculator::_interpolateCurrentSubStep1(G4double rfor
// get relative y coordinate
G4double yratio = ((side > 0)? x_e: x_a) / (x_e + x_a);
- //std::cout << "\tyratio: " << yratio << std::endl;
if(yratio <= 0.) yratio = 0.00001; // pull the point into the gap if it wouldn't be there;
else if(yratio >= 1.) yratio = 0.99999; // this may happen bec.G4 does not grantee that the full
@@ -100,11 +97,9 @@ G4double LArG4::EC::EnergyCalculator::_interpolateCurrentSubStep1(G4double rfor
WheelGeometry wg;
SetHalfWave(shift + vmap[2], wg);
- //std::cout << "\tPointFoldMapArea: " << PointFoldMapArea << ", SetHalfWave(" << shift + vmap[2] << ")" << std::endl;
G4double Ylimits[4];
SetYlimitsofPhigapinFieldMap(irlayer, wg, Ylimits); //on the lower layer
- //std::cout << "\tFieldmap limits: " << Ylimits[0] << " " << Ylimits[1] << " " << Ylimits[2] << " " << Ylimits[3] << std::endl;
G4double pos_low = 0.;
if(side < 0) pos_low = Ylimits[0] * (1. - yratio) + Ylimits[1] * yratio;
else if(side > 0) pos_low = Ylimits[2] * (1. - yratio) + Ylimits[3] * yratio;
@@ -125,32 +120,6 @@ G4double LArG4::EC::EnergyCalculator::_interpolateCurrentSubStep1(G4double rfor
G4double LArG4::EC::EnergyCalculator::GetCurrent1(const G4ThreeVector &P1, const G4ThreeVector &P2, G4double edep) const
{
- /*
- FILE *F = fopen("test1.dat", "w");
- if(F == 0) abort();
- G4ThreeVector a(0., 1200., 0.);
- for(double z = 0; z <= WheelThickness; z += 0.1){
- fprintf(F, "%f", z);
- // for(double x = -20.; x <= 20.; x += 1.){
- // a[0] = x;
- a[2] = z;
- // std::cout << "(" << z << ", " << x << ") " << DistanceToTheNeutralFibre(a) << std::endl;
- for(int s = -1; s <= 1; s ++){
- // std::cout << "\t" << s << " " << elc()->AmplitudeOfSurface(a, s) << std::endl;
- fprintf(F, " %f", elc()->AmplitudeOfSurface(a, s));
- }
- // }
- fprintf(F, "\n");
- }
- fclose(F);
-
- abort();
- */
-
- //std::cout << "GetCurrent1 -------------------------------------------------------------------------" << std::endl;
- //std::cout << "input: (" << P1.x() << ", " << P1.y() << ", " << P1.z() << "), ("
- // << P2.x() << ", " << P2.y() << ", " << P2.z() << "), " << edep << std::endl;
-
G4int gaperr = 0;
const std::pair<G4int, G4int> gap2 = lwc()->GetPhiGapAndSide(P2);
@@ -177,19 +146,11 @@ G4double LArG4::EC::EnergyCalculator::GetCurrent1(const G4ThreeVector &P1, cons
G4double current = 0.; //current to be returned
const G4double step_current = edep / nofstep / s_AverageCurrent; // base current for each step
- //std::cout << "gap1: " << gap1.first << ", " << gap1.second
- // << "; gap2: " << gap2.first << ", " << gap2.second << std::endl;
- //std::cout << "input: (" << P1.x() << ", " << P1.y() << ", " << P1.z() << "), ("
- // << P2.x() << ", " << P2.y() << ", " << P2.z() << "), " << edep << std::endl;
-
-
const G4double inv_nofstep = 1. / static_cast<double>(nofstep);
for(G4int i = 0; i < nofstep; ++ i){
G4double ds = (i + 0.5) * inv_nofstep;
G4ThreeVector Pe = P1 * (1. - ds) + P2 * ds;
G4ThreeVector Pa = Pe;
- //std::cout << "step " << i << std::endl;
- //std::cout << "\tpoint (" << Pe.x() << ", " << Pe.y() << ", " << Pe.z() << ")" << std::endl;
SetFoldArea(Pe.z(), fa); // set fold type
SetHalfWave(Pe.z(), wg); // set halfwave parameters for substep
@@ -206,16 +167,8 @@ G4double LArG4::EC::EnergyCalculator::GetCurrent1(const G4ThreeVector &P1, cons
const G4double yshift_on_map = rforalpha*M_PI/lwc()->GetNumberOfFans()-(FanAbsThickness() + FanEleThickness() )/2.;
const G4double yshift_on_wheel=sqrt(rvstep2)*M_PI/lwc()->GetNumberOfFans()-(FanAbsThickness() + FanEleThickness() )/2.;
const G4double cylgapcorr=yshift_on_wheel/yshift_on_map; // scale difference between plane and cylindrical surface
- /*
- std::cout<< " GetCurrent1**Nabs="<<lwc()->GetNumberOfFans()<<" absthick="<<FanAbsThickness<<" elethick="<<FanEleThickness
- <<" cylgapcorr-1="<<cylgapcorr-1
- <<" ZinHalfWave="<<ZinHalfWave<<" HalfWaveNumber="<<HalfWaveNumber
- <<std::endl;
- */
//<<<JT
- //std::cout << "\tvmap: (" << vmap[0] << ", " << vmap[1] << ", " << vmap[2] << ")" << std::endl;
-
const G4double HV_value = m_HVHelper->GetVoltage(Pe, gap1);
int Pe_fan = 0;
@@ -223,13 +176,9 @@ G4double LArG4::EC::EnergyCalculator::GetCurrent1(const G4ThreeVector &P1, cons
//G4int side = signof(dte);
int Pa_fan = 0;
const G4double dta = lwc()->DistanceToTheNearestFan(Pa, Pa_fan);
- //std::cout << "\tdte: " << dte << ", dta: " << dta << std::endl;
- //std::cout << "\tPe: (" << Pe.x() << ", " << Pe.y() << ", " << Pe.z() << ")" << std::endl;
- //std::cout << "\tPa: (" << Pa.x() << ", " << Pa.y() << ", " << Pa.z() << ")" << std::endl;
const G4double suppression_range = ElectrodeFanHalfThickness() + CHC_Esr();
if(fabs(dte) < suppression_range){
- // std::cout << " S";
continue; //skip point if too close to the electrode
}
@@ -237,7 +186,6 @@ G4double LArG4::EC::EnergyCalculator::GetCurrent1(const G4ThreeVector &P1, cons
+ fabs(dta) - lwc()->GetFanHalfThickness(); //correction to electrode suppression not to
G4double suppression = agap / ( agap - CHC_Esr() ); // change av. signal in the gap
if(suppression < 0.) suppression = 1.;
- //std::cout << "\tagap: " << agap << ", suppression: " << suppression << std::endl;
const G4double cur = _interpolateCurrentSubStep1( rforalpha, vmap, Pe, signof(dte), Pe_fan, Pa, signof(dta), Pa_fan, fa, gaperr );
//(25-05-2005) new current calculation: edep*1/U*IonReco*E*v_drift
@@ -263,7 +211,6 @@ G4double LArG4::EC::EnergyCalculator::GetCurrent1(const G4ThreeVector &P1, cons
current += substep_current;
// }
} // end of loop for substeps
- //std::cout << std::endl;
if(current < 0.){
gaperr -= 1000;
current = 0.;
@@ -282,7 +229,6 @@ G4double LArG4::EC::EnergyCalculator::GetCurrent1(const G4ThreeVector &P1, cons
}
#endif
- //std::cout<<"GetCurrent1::edep="<<edep<<" current="<<current <<" gaperr="<<gaperr<<std::endl;
return current;
}
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/LArEMECChargeCollection.cc b/LArCalorimeter/LArG4/LArG4EC/src/LArEMECChargeCollection.cc
index b327e8dcdd11dc8fc12ba80c344d5348cd276500..d2bfcbacb95d82183e775dab3c93b90a2b3a7945 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/LArEMECChargeCollection.cc
+++ b/LArCalorimeter/LArG4/LArG4EC/src/LArEMECChargeCollection.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// LArEMECChargeCollection.cc
@@ -98,9 +98,6 @@
void LArG4::EC::EnergyCalculator::CreateArrays(Wheel_Efield_Map &wheel, G4int n){
// ***************************************************************************
- // std::cout<<"***CreateArrays wheeltype; n="<<n
- // <<std::endl;
-
wheel.NumberOfRadialLayer = n;
wheel.RadiusOfLayers =new G4double [n];
wheel.FoldinAngleOfLayers =new G4double [n];
@@ -526,11 +523,6 @@ void LArG4::EC::EnergyCalculator::LoadFieldMaps(const G4String fname){
ATH_MSG_ERROR("GetFieldMaps Error reading field map");
}
- /* if(j<10) G4cout<<" z,y,weight="
- <<ChCollFoldType->FieldMap[Index(ChCollFoldType,i,0,j)]<<" "
- <<ChCollFoldType->FieldMap[Index(ChCollFoldType,i,1,j)]<<" "
- <<ChCollFoldType->FieldMap[Index(ChCollFoldType,i,2,j)]
- <<G4endl; */
} // end of loop(j) on points
}
@@ -631,11 +623,6 @@ void LArG4::EC::EnergyCalculator::PrepareFieldMap(Wheel_Efield_Map* ChCollWheelT
ChCollFoldType->FieldMap[Index(ChCollFoldType,i,0,ipnt)]=z;
ChCollFoldType->FieldMap[Index(ChCollFoldType,i,1,ipnt)]=y;
ChCollFoldType->FieldMap[Index(ChCollFoldType,i,2,ipnt)]=wx;
-
- /* if(ipnt<10)
- G4cout<<" ilayer="<<i<<" ipnt="<<ipnt<<" weights="
- <<ChCollFoldType->FieldMap[Index(ChCollFoldType,i,2,ipnt)]
- <<G4endl;*/
}
} // end j loop for points
@@ -962,7 +949,6 @@ G4double LArG4::EC::EnergyCalculator::GetCurrent(
}
}
- //std::cout <<"GetCurrent0:: edep="<<edep<<" current="<<current<<" gaperr="<<gaperr<<std::endl;
#endif
return current;
@@ -1142,8 +1128,6 @@ void LArG4::EC::EnergyCalculator::SetFoldArea(G4double zinwheel, FoldArea & fa)
void LArG4::EC::EnergyCalculator::SetHalfWave(G4double zinwheel, WheelGeometry & wg) const {
// ***********************************************************
- // G4cout<<"***SetHalfWave zin="<<zinwheel<<G4endl;
-
const G4double z = zinwheel - lwc()->GetStraightStartSection();
wg.HalfWaveNumber = int((z+lwc()->GetQuarterWaveLength())/lwc()->GetHalfWaveLength());
wg.ZinHalfWave=z - wg.HalfWaveNumber*lwc()->GetHalfWaveLength();
@@ -1346,10 +1330,8 @@ G4double LArG4::EC::EnergyCalculator::YofSurface(G4double alpha,G4double rho,G4d
return wg.SignofSlopeofHalfWave*wg.ZinHalfWave/t+th/s;
}
- // std::cout<<"*** ERROR1 in YofSURF!!!!"<<std::endl;
return 0.;
}
- //std::cout<<"*** ERROR2 in YofSURF!!!!"<<std::endl;
return 0.;
}
diff --git a/LArCalorimeter/LArG4/LArG4FCAL/src/LArFCALCalibCalculatorBase.cc b/LArCalorimeter/LArG4/LArG4FCAL/src/LArFCALCalibCalculatorBase.cc
index 228f307ee57c7e681cb454679447437196162312..bedd89822a825e433ca6cc216e362e71186cc568 100644
--- a/LArCalorimeter/LArG4/LArG4FCAL/src/LArFCALCalibCalculatorBase.cc
+++ b/LArCalorimeter/LArG4/LArG4FCAL/src/LArFCALCalibCalculatorBase.cc
@@ -193,24 +193,6 @@ namespace LArG4 {
<< etaIndex
<< phiIndex;
- // std::cout << "LArG4FCAL/LArFCALCalibCalculatorBase: 4/3/"
- // <<zSide<<"/"
- // <<sampling<<"/"
- // <<etaIndex<<"/"
- // <<phiIndex<<": "
- // << energies[0] << ", "
- // << energies[1] << ", "
- // << energies[2] << ", "
- // << energies[3]
- // << ", i=" << i
- // << ", j=" << j
- // << ", l.x=" << theLocalPoint.x()
- // << ", l.y=" << theLocalPoint.y()
- // << ", p.x=" << p.x()
- // << ", p.y=" << p.y()
- // << ", deltaX=" << m_deltaX
- // << ", deltaY=" << m_deltaY
- // << std::endl;
}
else {
// S.M.: we have a hit which fails the electrode identifier
@@ -270,25 +252,6 @@ namespace LArG4 {
<< etaIndex
<< phiIndex;
- // std::cout << "LArG4FCAL/LArFCALCalibCalculatorBase: 10/4/"
- // <<type<<"/"
- // <<sampling<<"/"
- // <<region<<"/"
- // <<etaIndex<<"/"
- // <<phiIndex<<": "
- // << energies[0] << ", "
- // << energies[1] << ", "
- // << energies[2] << ", "
- // << energies[3]
- // << ", i=" << i
- // << ", j=" << j
- // << ", l.x=" << theLocalPoint.x()
- // << ", l.y=" << theLocalPoint.y()
- // << ", p.x=" << p.x()
- // << ", p.y=" << p.y()
- // << ", deltaX=" << m_deltaX
- // << ", deltaY=" << m_deltaY
- // << std::endl;
}
return true;
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECLocalCalculator.cc b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECLocalCalculator.cc
index 4d29073571dcb22772c6d89c75916f852af98c0e..dc94a92918234b8fcc5e9df2c55860aead390c1d 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECLocalCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECLocalCalculator.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHECLocalCalculator.h"
@@ -89,6 +89,5 @@ G4bool LArHECLocalCalculator::Process(const G4Step* a_step, int depthadd, double
// Calculate the identifier.
hdata[0].id = m_Geometry->CalculateIdentifier( a_step, LArG4::HEC::kLocActive, depthadd, deadzone);
-// std::cout<<"LArHECLocalCalculator::Process "<<depthadd<<std::endl;
return true;
}
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.cc b/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.cc
index c50b71729dd8a3c1280ab88cafa3b127fddf65b4..24c73ebab4541f8a8fc114ec11dbb181c68c331b 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LocalCalibrationCalculator.h"
@@ -23,9 +23,6 @@ namespace LArG4 {
declareProperty("GeometryCalculator", m_geometryCalculator);
declareProperty("GeometryType",m_strgeometryType="ACTIVE");
m_strgeometryType.declareUpdateHandler(&LocalCalibrationCalculator::GeometryTypeUpdateHandler, this);
-#ifdef DEBUG_HITS
- std::cout << "LArG4::HEC::LocalCalibrationCalculator constructed" << std::endl;
-#endif
}
void LocalCalibrationCalculator::GeometryTypeUpdateHandler(Gaudi::Details::PropertyBase&)
@@ -73,15 +70,9 @@ namespace LArG4 {
const eCalculatorProcessing process) const
{
-#ifdef DEBUG_HITS
- std::cout << "LArG4::HEC::LocalCalibrationCalculator::Process" << std::endl;
-#endif
energies.clear();
if ( process == kEnergyAndID || process == kOnlyEnergy )
{
-#ifdef DEBUG_HITS
- std::cout << " calling SimulationEnergies" << std::endl;
-#endif
m_energyCalculator.Energies( step, energies );
}
else
@@ -95,9 +86,6 @@ namespace LArG4 {
const G4TouchableHistory* theTouchable = static_cast<const G4TouchableHistory*>(pre_step_point->GetTouchable());
// Volume name
G4String hitVolume = theTouchable->GetVolume(0)->GetName();
-#ifdef DEBUG_HITS
- std::cout<<"LArHECLocalCalibrationCalculator::Process Volume: "<<hitVolume<<std::endl;
-#endif
if(hitVolume.contains("::") ) {
const int last = hitVolume.last(':');
hitVolume.remove(0,last+1);
@@ -121,18 +109,6 @@ namespace LArG4 {
} else identifier = LArG4Identifier();
} else identifier = m_geometryCalculator->CalculateIdentifier(step, m_geometryType, 0, 4.*CLHEP::mm);
-#ifdef DEBUG_HITS
- G4double energy = accumulate(energies.begin(),energies.end(),0.);
- std::cout << "LArG4::HEC::LocalCalibrationCalculator::Process"
- << " ID=" << std::string(identifier)
- << " energy=" << energy
- << " energies=(" << energies[0]
- << "," << energies[1]
- << "," << energies[2]
- << "," << energies[3] << ")"
- << std::endl;
-#endif
-
// Check for bad result.
if ( identifier == LArG4Identifier() ) return false;
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/LocalGeometry.cc b/LArCalorimeter/LArG4/LArG4HEC/src/LocalGeometry.cc
index b38d67781f67282e4f71de55e4d1015866fc6ce5..dca57ab71839672618071ec183069ead4c498115 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/LocalGeometry.cc
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/LocalGeometry.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// LArG4::HEC::LocalGeometry
@@ -48,21 +48,16 @@ namespace LArG4 {
xh = 4;
}
- // std::cout<<"binSearch::ly "<<ly<<" depth: "<<depth<<" reg: "<<reg<<std::endl;
- // if(ly < m_pads[depth][xl] || ly > m_pads[depth][xh] ) return -1;
if(ly < m_pads[depth][xl]) return xl;
if(ly > m_pads[depth][xh] ) return xh-1;
while( xl < xh - 1 ) {
const int ires(xl + (xh - xl)/2);
- // G4cout<<"xl: "<<xl<<" xh: "<<xh<<" ires: "<<ires<<" m_pads[depth][ires]: "<< m_pads[depth][ires]<<endl;
if (ly == m_pads[depth][ires]) return ires - 1;
if (ly < m_pads[depth][ires])
xh = ires;
else
xl = ires;
}
- // std::cout<<xl<<std::endl;
-
return xl;
}
@@ -72,20 +67,16 @@ namespace LArG4 {
int xh(14); // = NUM_ETABIN-1
int ires(0);
- // std::cout<<"binSearchAll::ly "<<ly<<" depth: "<<depth<<" regular: "<<regular<<std::endl;
- // if(ly < m_pads[depth][xl] || ly > m_pads[depth][xh] ) return -1;
if(ly < m_pads[depth][xl]) return xl;
if(ly > m_pads[depth][xh] ) return xh-1;
while( xl < xh - 1 ) {
ires = xl + (xh - xl)/2;
- // G4cout<<"xl: "<<xl<<" xh: "<<xh<<" ires: "<<ires<<" m_pads[depth][ires]: "<< m_pads[depth][ires]<<endl;
if (ly == m_pads[depth][ires]) return ires - 1;
if (ly < m_pads[depth][ires])
xh = ires;
else
xl = ires;
}
- // std::cout<<xl<<" "<<m_pads[depth][xl]<<" "<<m_pads[depth][xl+1]<<std::endl;
if(regular) { // we should recompute to 0.1 eta binning overall numbering
if(xl < 4) {
ires = xl;
@@ -95,7 +86,6 @@ namespace LArG4 {
xl += 4;
}
}
- // std::cout<<"After recomput.: "<<xl<<std::endl;
return xl;
}
@@ -209,9 +199,6 @@ namespace LArG4 {
// if(g_type == kLocDead) {
if(deadzone == 0.) {
// The hitted volume's identier is possible to get by the name of his "mother" volume.
- // G4cout <<" hitLogiVolume->GetNoDaughters= " <<hitLogiVolume->GetNoDaughters()<<G4endl;
- // G4cout <<"+++++"<<hitLogiVolume->GetDaughter(1)->GetLogicalVolume()->GetMaterial()->GetName()<<G4endl;
- // G4cout <<"+++++"<<hitLogiVolume->GetName()<<G4endl;
G4String hitVolume=a_step->GetPreStepPoint()->GetPhysicalVolume()->GetName();
@@ -317,9 +304,6 @@ namespace LArG4 {
// Check, if we are not in dead zone
double distance = deadZone(fabs(locx),locy);
if(depthadd < 0 || distance < deadzone) { // we return the dead identifier
-#ifdef DEBUG_HEC
- std::cout<<" In active copyModule = "<< copyModule<<std::endl;
-#endif
if(zSide * locx < 0) phiBin = copyModule;
else {
if(copyModule == 31) phiBin = 0; else phiBin=copyModule+1;
@@ -332,10 +316,6 @@ namespace LArG4 {
<< region+2
<< etaBin
<< phiBin;
-#ifdef DEBUG_HEC
- std::cout <<"HEC::LocalGeometry ++Dead in active zSide = "<<zSide<<" type = 2"<<" , sampling = "<<sampling
- <<" , region="<<region+2 << " , phiBin="<<phiBin<< " , etaBin="<<etaBin <<std::endl;
-#endif
} else { // we return regular ID
@@ -362,10 +342,6 @@ namespace LArG4 {
<< region
<< etaBin
<< phiBin;
-#ifdef DEBUG_HEC
- std::cout <<"HEC::LocalGeometry ++Active zSide = "<<zSide<<" , sampling = "<<sampling<<" , region="<<region <<
- " , phiBin="<<phiBin<< " , etaBin="<<etaBin <<std::endl;
-#endif
}
return result;
@@ -417,13 +393,7 @@ namespace LArG4 {
if(zSide * pinLocal.x() > 0) ++phiBin;
}
*/
-#ifdef DEBUG_HEC_OLD_DIAGNOSTIC
- std::cout<<"HEC::LocalGeometry Module locy: "<<locy<<" locz: "<<locz<<std::endl;
-#endif
if(abslocz < m_firstAbsorber[0]) { // in front of HEC
-#ifdef DEBUG_HEC_OLD_DIAGNOSTIC
- std::cout<<"In front of HEC"<<std::endl;
-#endif
type = 1;
sampling = 2;
region = 3;
@@ -431,9 +401,6 @@ namespace LArG4 {
etaBin = 16 - binSearchAll(locy, 0, true);
if( etaBin < 0 ) etaBin = 0;
} else if(abslocz > m_depthSize[0] + m_depthSize[1] + m_depthSize[2] && abslocz < m_depthSize[0] + m_depthSize[1] + m_depthSize[2] + m_betweenWheel + m_firstAbsorber[3]) { // interwheel gap
-#ifdef DEBUG_HEC_OLD_DIAGNOSTIC
- std::cout<<"interwheel gap"<<std::endl;
-#endif
type = 1;
sampling = 2;
region = 4;
@@ -443,9 +410,6 @@ namespace LArG4 {
// sampling = localSampling(pinLocal.z()/Units::mm);
double distance = deadZone(fabs(pinLocal.x()/Units::mm),locy);
if(distance > deadzone) { // We should return the inactive Id !!!!
-#ifdef DEBUG_HEC_OLD_DIAGNOSTIC
- std::cout<<"inactive Id"<<std::endl;
-#endif
int depthNum;
if(abslocz < m_depthSize[0]) {
sampling = 0; depthNum=0;
@@ -475,10 +439,6 @@ namespace LArG4 {
etaBin = 13;
}
etaBin -= binSearch(locy, depthNum, region);
-#ifdef DEBUG_HEC
- std::cout <<"HEC::LocalGeometry zSide = "<<zSide<<" , sampling = "<<sampling<<" , region="<<region <<
- " , phiBin="<<phiBin<< " , etaBin="<<etaBin <<std::endl;
-#endif
if(region==1 && etaBin == 3 && (sampling == 1 || sampling == 2)) etaBin = 2;
if(region==0 && etaBin == 0 && sampling == 2) etaBin = 1;
if(region==0 && etaBin < 2 && sampling == 3) etaBin = 2;
@@ -491,9 +451,6 @@ namespace LArG4 {
<< phiBin;
return result;
} // intermodule cracks otherwise
-#ifdef DEBUG_HEC_OLD_DIAGNOSTIC
- std::cout<<"intermodule crack"<<std::endl;
-#endif
if(zSide<0) {
if(copyN-1<16) copyModule = abs(copyN - 1 - 15); else copyModule = 47 - (copyN - 1);
} else {
@@ -528,9 +485,6 @@ namespace LArG4 {
region = 2;
etaBin = 13;
}
-#ifdef DEBUG_HEC_OLD_DIAGNOSTIC
- std::cout<<locy<<" "<<m_pads[depthNum][4]<<" "<<region<<std::endl;
-#endif
etaBin -= binSearch(locy, depthNum, region-2);
}
} else if (copyN==50 ) { // First Absorber - in front of HEC
@@ -605,7 +559,6 @@ namespace LArG4 {
} else { // intermodule cracks
double distance = deadZone(fabs(locx),locy);
if(distance > deadzone) { // We should return the inactive Id !!!!
- // std::cout<<"Calling kLocInactive"<<std::endl;
return CalculateIdentifier(a_step, kLocInactive, -1, deadzone);
}
copyModule = theTouchable->GetVolume(1)->GetCopyNo() - 1;
@@ -635,10 +588,6 @@ namespace LArG4 {
}
}
-#ifdef DEBUG_HEC
- std::cout <<"HEC::LocalGeometry ++Dead zSide = "<<zSide<<" type = "<<type<<" , sampling = "<<sampling
- <<" , region="<<region << " , phiBin="<<phiBin<< " , etaBin="<<etaBin <<std::endl;
-#endif
result << 10 // DeadM
<< 2*zSide // LAr
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
index f4cf04aa9710a6853e06826931977ee52ed12bc9..60e0dd6de51c681306eb12bc7487a4235fde51ac 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
@@ -237,7 +237,6 @@ EMBHVManager::getData (idfunc_t idfunc,
unsigned int chanID = (*citr).first;
int cannode = chanID/1000;
int line = chanID%1000;
- //std::cout << " ++ found data for cannode, line " << cannode << " " << line << std::endl;
// 2. Construct the identifier
HWIdentifier id = m_c->hvId->HVLineId(1,1,cannode,line);
@@ -250,8 +249,6 @@ EMBHVManager::getData (idfunc_t idfunc,
int detector = m_c->elecId->detector(elecHWID);
if (detector==0) {
- //std::cout << " in Barrel " << std::endl;
-
// side in standard offline 0 for z<0 (C) 1 for z>0 (A)
// in electrode numbering, this is the opposite (0 for A and 1 for C)
unsigned int sideIndex=1-m_c->elecId->zside(elecHWID);
@@ -310,9 +307,6 @@ EMBHVManager::getData (idfunc_t idfunc,
float current = 0.;
if (!((*citr).second)["R_IMEAS"].isNull()) current = ((*citr).second)["R_IMEAS"].data<float>();
- // std::cout << " hvlineId,elecHWID,cannode,line, side,phi module, sector,eta,electrode,gap,index " << std::hex << id << " " << elecHWID << std::dec << " " << cannode << " " << line << " " << m_c->elecId->zside(elecHWID) << " " << m_c->elecId->module(elecHWID) << " " << m_c->elecId->hv_phi(elecHWID) << " " << m_c->elecId->hv_eta(elecHWID) << " " << m_c->elecId->electrode(elecHWID)
- // << " " << gapIndex << " " << index << " " << voltage << std::endl;
-
payload->m_payloadArray[index].voltage[gapIndex]=voltage;
payload->m_payloadArray[index].current[gapIndex]=current;
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx
index 3876a98d0690924a52fa882f37b0d5ed8ffd355b..c8ff5660f61266b3c01c99dc09d1b51a163b0079 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx
@@ -233,7 +233,6 @@ EMBPresamplerHVManager::getData (idfunc_t idfunc,
unsigned int chanID = (*citr).first;
int cannode = chanID/1000;
int line = chanID%1000;
- //std::cout << " ++ found data for cannode, line " << cannode << " " << line << std::endl;
// 2. Construct the identifier
HWIdentifier id = m_c->hvId->HVLineId(1,1,cannode,line);
@@ -247,8 +246,6 @@ EMBPresamplerHVManager::getData (idfunc_t idfunc,
int detector = m_c->elecId->detector(elecHWID);
if (detector==1) {
- //std::cout << " in Barrel " << std::endl;
-
// side in standard offline 0 for z<0 (C) 1 for z>0 (A)
// in electrode numbering, this is the opposite (0 for A and 1 for C)
unsigned int sideIndex=1-m_c->elecId->zside(elecHWID);
@@ -289,9 +286,6 @@ EMBPresamplerHVManager::getData (idfunc_t idfunc,
float current = 0.;
if (!((*citr).second)["R_IMEAS"].isNull()) current = ((*citr).second)["R_IMEAS"].data<float>();
- // std::cout << " hvlineId,elecHWID,cannode,line, side,phi module, sector,eta,electrode,gap,index " << std::hex << id << " " << elecHWID << std::dec << " " << cannode << " " << line << " " << m_c->elecId->zside(elecHWID) << " " << m_c->elecId->module(elecHWID) << " " << m_c->elecId->hv_phi(elecHWID) << " " << m_c->elecId->hv_eta(elecHWID) << " " << m_c->elecId->electrode(elecHWID)
- // << " " << gapIndex << " " << index << " " << voltage << std::endl;
-
payload->m_payloadArray[index].voltage[gapIndex]=voltage;
payload->m_payloadArray[index].current[gapIndex]=current;
payload->m_payloadArray[index].hvLineNo[gapIndex]=chanID;
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
index 29027c796aff85cd4cb532ea884c762dde0b1acb..4f404fbfe55de9d510931d64aba252518b1ca239 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
@@ -278,7 +278,6 @@ EMECHVManager::getData (idfunc_t idfunc,
unsigned int chanID = (*citr).first;
int cannode = chanID/1000;
int line = chanID%1000;
- //std::cout << " ++ found data for cannode, line " << cannode << " " << line << std::endl;
// 2. Construct the identifier
HWIdentifier id = m_c->hvId->HVLineId(1,1,cannode,line);
@@ -347,9 +346,6 @@ EMECHVManager::getData (idfunc_t idfunc,
float current = 0.;
if (!((*citr).second)["R_IMEAS"].isNull()) current = ((*citr).second)["R_IMEAS"].data<float>();
- //std::cout << " hvlineId,elecHWID,cannode,line, side,phi module, sector,eta,electrode,gap,index " << std::hex << id << " " << elecHWID << std::dec << " " << cannode << " " << line << " " << m_c->elecId->zside(elecHWID) << " " << m_c->elecId->module(elecHWID) << " " << m_c->elecId->hv_phi(elecHWID) << " " << m_c->elecId->hv_eta(elecHWID) << " " << m_c->elecId->electrode(elecHWID)
- // << " " << gapIndex << " " << index << " " << voltage << std::endl;
-
payload->m_payloadArray[index].voltage[gapIndex]=voltage;
payload->m_payloadArray[index].current[gapIndex]=current;
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx
index ba6f5be5c64340089862aa87a06ab7c4785b719a..c0a82bddd6542ad35eeb049de685142a2ee56816 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx
@@ -209,7 +209,6 @@ EMECPresamplerHVManager::getData (idfunc_t idfunc,
unsigned int chanID = (*citr).first;
int cannode = chanID/1000;
int line = chanID%1000;
- //std::cout << " ++ found data for cannode, line " << cannode << " " << line << std::endl;
// 2. Construct the identifier
HWIdentifier id = m_c->hvId->HVLineId(1,1,cannode,line);
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
index e58d4120df7c709a1ad76abdbb5394405a5f6714..131d8ac38bbfc8cfb18acf7b6892995dec3b6d03 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
@@ -211,7 +211,6 @@ FCALHVManager::getData (idfunc_t idfunc,
unsigned int chanID = (*citr).first;
int cannode = chanID/1000;
int line = chanID%1000;
- //std::cout << " cannode,line " << cannode << " " << line << std::endl;
// 2. Construct the identifier
HWIdentifier id = m_c->hvId->HVLineId(1,1,cannode,line);
@@ -224,8 +223,6 @@ FCALHVManager::getData (idfunc_t idfunc,
int detector = m_c->elecId->detector(elecHWID);
if (detector==5) {
- //std::cout << " FCAl channel found " << (*citr).first << std::endl;
-
float voltage = -99999.;
if (!((*citr).second)["R_VMEAS"].isNull()) voltage = ((*citr).second)["R_VMEAS"].data<float>();
float current = 0.;
@@ -236,8 +233,6 @@ FCALHVManager::getData (idfunc_t idfunc,
unsigned int sectorIndex=m_c->elecId->module(elecHWID); // 0-15 FCAL1, 0-7 FCAl2, 0-3 FCAL3
unsigned int lineIndex=m_c->elecId->gap(elecHWID); // 0-3
- //std::cout << " channel found " << sideIndex << " " << samplingIndex << " " << sectorIndex << " " << lineIndex << " "<< voltage << std::endl;
-
// do we have to worry about phi sector numbering running backwards in phi for z<0 like in EM/HEC ????
unsigned int index = 192*sideIndex+12*sectorIndex+4*samplingIndex+lineIndex;
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
index 8128556606a26b5fe0ae8f858bdbea9e36799396..77ecb18dd1c1ef9954a4a8ae511c0180f0df21a3 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
@@ -233,7 +233,6 @@ HECHVManager::getData (idfunc_t idfunc,
// check we are in HEC
if (detector != 4) {
- //std::cout << " Not HEC ??? " << std::endl;
continue;
}
diff --git a/LArCalorimeter/LArRecUtils/src/LArADC2MeVTool.cxx b/LArCalorimeter/LArRecUtils/src/LArADC2MeVTool.cxx
index d0cb9f9ed5f23f73f5b64b5a4a1c4fc1058dc210..9bebaac9a3b32803e59efbf7763b176219cb83b1 100644
--- a/LArCalorimeter/LArRecUtils/src/LArADC2MeVTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArADC2MeVTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArADC2MeVTool.h"
@@ -396,13 +396,6 @@ StatusCode LArADC2MeVTool::getADC2MeV() const {
for(unsigned int igain=0;igain<ngains;igain++)
if ( m_isSC ) m_ADC2MeV_vec[idhash] = std::vector<float>(0);
else m_ADC2MeV->setPdata(id,std::vector<float>(0),igain);
- //
-// std::vector<float> vADC2MeV;
-// vADC2MeV.push_back(0);
-// //std::cout << "setting disconnected Feb id "<< feb.get_compact() <<" channel " << chan << std::endl;
-// m_ADC2MeV->setPdata(id,vADC2MeV,igain);
-// }
-
}//End loop over channels
ATH_MSG_INFO("Ntotal = " << count);
diff --git a/LArCalorimeter/LArRecUtils/src/LArFCalTowerStore.cxx b/LArCalorimeter/LArRecUtils/src/LArFCalTowerStore.cxx
index 1b849095818946d7dd157f30b9a8740ed96315e0..4932ba90feb8acbe8e8639b83f6124bc2112e510 100644
--- a/LArCalorimeter/LArRecUtils/src/LArFCalTowerStore.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArFCalTowerStore.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/********************************************************************
@@ -126,11 +126,8 @@ bool LArFCalTowerStore::buildLookUp(const CaloCell_ID& cellIdHelper,
for( size_t cellIndex = m_indxOffset; cellIndex <= m_indxBound; cellIndex++){
- //size_t anIndex = this->getLookupIndex(cellIndex);
-
- //std::cout<<"cell:"<<anIndex<<std::endl;
- // get cell geometry
+ // get cell geometry
const CaloDetDescrElement* theElement = theManager.get_element(cellIndex);
if (!theElement) {
msg << MSG::ERROR<< "Can't find element for index " << cellIndex
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
index 63188372eb265c59d1cc705fef9875e03502f090..aeef11103c4704f825188ed321347b30d29155d6 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
@@ -378,7 +378,6 @@ StatusCode LArHVCondAlg::fillPayload(LArHVData* hvdata
v.clear();
ihv.clear();
if (abs(m_larem_id->barrel_ec(id))==1 && m_larem_id->sampling(id) > 0) { // LAr EMB
- //std::cout << " in barrel " << m_larem_id->show_to_string(id) << std::endl;
unsigned int index = (unsigned int)(m_larem_id->channel_hash(id));
bool hasPathology=false;
if (index<hasPathologyEM.size()) {
@@ -391,13 +390,11 @@ StatusCode LArHVCondAlg::fillPayload(LArHVData* hvdata
if (!embElement) std::abort();
const EMBCellConstLink cell = embElement->getEMBCell();
unsigned int nelec = cell->getNumElectrodes();
- //std::cout << " nelec: " << nelec << std::endl;
unsigned int ngap = 2*nelec;
double wt = 1./ngap;
v.clear(); ihv.clear();
for (unsigned int i=0;i<nelec;i++) {
const EMBHVElectrode& electrode = cell->getElectrode(i);
- //std::cout << "electrode: endcap index, eta index , phi index, sector index , electrode index " << electrode->getModule()->getSideIndex() <<
// " " << electrode->getModule()->getEtaIndex() << " " << electrode->getModule()->getPhiIndex() <<
// " " << electrode->getModule()->getSectorIndex() << " " << electrode->getElectrodeIndex() << std::endl;
for (unsigned int igap=0;igap<2;igap++) {
@@ -437,8 +434,6 @@ StatusCode LArHVCondAlg::fillPayload(LArHVData* hvdata
}
msg(MSG::VERBOSE) << "set hv: "<<hv<<endmsg;
}
- //std::cout << " hv value " << hv << std::endl;
- //if (igap==1 && hv>1.) std::cout << " --- non zero value found for gap1 in barrel " << std::endl;
addHV(v,hv,wt);
addCurr(ihv,curr,wt);
}
@@ -486,7 +481,6 @@ StatusCode LArHVCondAlg::fillPayload(LArHVData* hvdata
}
} else if (abs(m_larem_id->barrel_ec(id))>1 && m_larem_id->sampling(id) > 0){ // LAr EMEC
- //std::cout << " in EMEC " << m_larem_id->show_to_string(id) << std::endl;
unsigned int index = (unsigned int)(m_larem_id->channel_hash(id));
bool hasPathology=false;
if (index<hasPathologyEM.size()) {
@@ -500,14 +494,10 @@ StatusCode LArHVCondAlg::fillPayload(LArHVData* hvdata
if (!emecElement) std::abort();
const EMECCellConstLink cell = emecElement->getEMECCell();
unsigned int nelec = cell->getNumElectrodes();
- //std::cout << " nelec " << nelec << std::endl;
unsigned int ngap = 2*nelec;
double wt = 1./ngap;
for (unsigned int i=0;i<nelec;i++) {
const EMECHVElectrode& electrode = cell->getElectrode(i);
- // std::cout << "electrode: endcap index, eta index , phi index, sector index , electrode index " << electrode->getModule()->getSideIndex() <<
- // " " << electrode->getModule()->getEtaIndex() << " " << electrode->getModule()->getPhiIndex() <<
- // " " << electrode->getModule()->getSectorIndex() << " " << electrode->getElectrodeIndex() << std::endl;
for (unsigned int igap=0;igap<2;igap++) {
unsigned int hvline = electrode.hvLineNo(igap,hvCabling);
const std::vector<unsigned int>::const_iterator itrLine=std::lower_bound(hvlineidx.begin(), hvlineidx.end(), hvline);
@@ -542,8 +532,6 @@ StatusCode LArHVCondAlg::fillPayload(LArHVData* hvdata
}
}
}
- //std::cout << " hv value " << hv << std::endl;
- //if (igap==1 && hv>1.) std::cout << " --- non zero value found for gap1 in endcap " << std::endl;
addHV(v,hv,wt);
addCurr(ihv,curr,wt);
}
@@ -622,7 +610,6 @@ StatusCode LArHVCondAlg::fillPayload(LArHVData* hvdata
for( auto id: m_larhec_id->channel_ids()) {
v.clear();
ihv.clear();
- //std::cout << " in HEC " << std::endl;
unsigned int index = (unsigned int)(m_larhec_id->channel_hash(id));
bool hasPathology=false;
if (index<hasPathologyHEC.size()) {
@@ -636,7 +623,6 @@ StatusCode LArHVCondAlg::fillPayload(LArHVData* hvdata
const HECCellConstLink cell = hecElement->getHECCell();
unsigned int nsubgaps = cell->getNumSubgaps();
double wt = 1./nsubgaps;
- //std::cout << " nsubgaps " << nsubgaps << std::endl;
for (unsigned int i=0;i<nsubgaps;i++) {
const HECHVSubgap& subgap = cell->getSubgap(i);
unsigned int hvline = subgap.hvLineNo(hvCabling);
@@ -664,7 +650,6 @@ StatusCode LArHVCondAlg::fillPayload(LArHVData* hvdata
));
curr *= uAkOhm * rValues[ridx];
}
- //std::cout << " hv value " << hv << std::endl;
if (hasPathology) {
msg(MSG::VERBOSE) << "Has pathology for id: "<< m_larhec_id->print_to_string(id)<<" "<<hasPathologyHEC[index]<<endmsg;
for (unsigned int ii=0;ii<listElec.size();ii++) {
@@ -706,7 +691,6 @@ StatusCode LArHVCondAlg::fillPayload(LArHVData* hvdata
for(auto id: m_larfcal_id->channel_ids()) { // LAr FCAL
v.clear();
ihv.clear();
- //std::cout << " in FCAL " << std::endl;
unsigned int index = (unsigned int)(m_larfcal_id->channel_hash(id));
bool hasPathology=false;
if (index<hasPathologyFCAL.size()) {
@@ -718,16 +702,12 @@ StatusCode LArHVCondAlg::fillPayload(LArHVData* hvdata
const FCALDetectorElement* fcalElement = dynamic_cast<const FCALDetectorElement*>(calodetdescrmgr->get_element(id));
if (!fcalElement) std::abort();
const FCALTile* tile = fcalElement->getFCALTile();
- //std::cout << " --- in FCAL cell id " << m_larfcal_id->show_to_string(id) << std::endl;
- //std::cout << " Side, Module, I,J index " << tile->getModule()->getEndcapIndex() << " " << tile->getModule()->getModuleIndex()
- // << " " << tile->getIndexI() << " " << tile->getIndexJ() << std::endl;
unsigned int nlines = tile->getNumHVLines();
unsigned int nlines_found=0;
for (unsigned int i=0;i<nlines;i++) {
const FCALHVLine* line = tile->getHVLine(i);
if (line) nlines_found++;
}
- //std::cout << " nlines " << nlines << " " << nlines_found << std::endl;
if (nlines_found>0) {
double wt = 1./nlines_found;
for (unsigned int i=0;i<nlines;i++) {
@@ -758,7 +738,6 @@ StatusCode LArHVCondAlg::fillPayload(LArHVData* hvdata
));
curr *= uAkOhm * rValues[ridx];
}
- //std::cout << " line " << line;
if (hasPathology) {
msg(MSG::VERBOSE) << "Has pathology for id: "<< m_larfcal_id->print_to_string(id)<<" "<<hasPathologyFCAL[index]<<endmsg;
for (unsigned int ii=0;ii<listElec.size();ii++) {
@@ -768,7 +747,6 @@ StatusCode LArHVCondAlg::fillPayload(LArHVData* hvdata
}
}
}
- //std::cout << " hv value " << hv << std::endl;
addHV(v,hv,wt);
addCurr(ihv,curr,wt);
}
@@ -1561,7 +1539,6 @@ StatusCode LArHVCondAlg::updateMethod(CaloAffectedRegionInfoVec *vAffected, cons
extendPhiRegion(current_phi_low,phi_min_additive1,phi_max_additive1);
extendPhiRegion(current_phi_high,phi_min_additive1,phi_max_additive1);
- // std::cout << "found the special case, icha=" << icha << ", etamin=" << eta_min_additive1 << ", current layer=" << current_layer << ", current eta=" << current_eta << std::endl;
}
else { //normal case
is_normal=1; // normal case
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVIdMappingAlg.cxx b/LArCalorimeter/LArRecUtils/src/LArHVIdMappingAlg.cxx
index 19ec59b8cdc4a6ca1070dc1ecb00108376776ddd..ada5c82c2d292de50af5bcb8be4f4ef63dc66f2a 100644
--- a/LArCalorimeter/LArRecUtils/src/LArHVIdMappingAlg.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVIdMappingAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHVIdMappingAlg.h"
@@ -200,8 +200,6 @@ void LArHVIdMappingAlg::fillHVMap(std::map<HWIdentifier,HWIdentifier> & elmap, s
electrodeIdvec.clear();
HWIdentifier hvlineId = hvlineHelper->HVLineId(hvpartition,hvcanline,hvcannode,hvline);
- //std::cout << " module, line " << hvcannode << " " << hvline << " ---- > hvLineId " << hvlineId << std::endl;
-
if( max > min ){
if (min < 0) min = 0;
if (max < 0) max = 0;
@@ -222,12 +220,6 @@ void LArHVIdMappingAlg::fillHVMap(std::map<HWIdentifier,HWIdentifier> & elmap, s
//ATH_MSG_DEBUG("[fillHVMap] push_back in electrodeId vector..." );
// Check if electrode is already in map ?
- // std::map<HWIdentifier,HWIdentifier>::iterator testIt = elmap.find(electrodeId);
- // if (testIt != elmap.end()) {
- // std::cout << " ----- Electrode Id " << side << " " << mod << " " << hvphi << " " << hveta << " " << hvgap << " " << ielec <<
- // " read for HvLine " << hvcannode << " " << hvline << " " << hvlineId << " already exist for " << (testIt)->second << std::endl;
- // }
-
elmap.insert(std::pair<HWIdentifier,HWIdentifier>(electrodeId,hvlineId));
}
}
@@ -237,12 +229,6 @@ void LArHVIdMappingAlg::fillHVMap(std::map<HWIdentifier,HWIdentifier> & elmap, s
electrodeIdvec.push_back(electrodeId);
// Check if electrode is already in map ?
- // std::map<HWIdentifier,HWIdentifier>::iterator testIt = elmap.find(electrodeId);
- // if (testIt != elmap.end()) {
- // std::cout << " ----- Electrode Id " << side << " " << mod << " " << hvphi << " " << hveta << " " << hvgap << " " << min <<
- // " read for HvLine " << hvcannode << " " << hvline << " " << hvlineId << " already exist for " << (testIt)->second << std::endl;
- // }
-
elmap.insert(std::pair<HWIdentifier,HWIdentifier>(electrodeId,hvlineId));
}
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrCondAlg.cxx b/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrCondAlg.cxx
index 96361de3c3c5de40899fa485a2fcb4a128b158bb..d3971fe10491b7289855ee405dda86727d739023 100644
--- a/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrCondAlg.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVScaleCorrCondAlg.cxx
@@ -532,7 +532,6 @@ float LArHVScaleCorrCondAlg::Scale_barrel(const float hv) const
else {
resp=facteur[0]*(hv/hvref[0]);
}
- //std::cout << " hv,i1,i2,resp " << hv << " " << i1 << " " << i2 << " " << resp << std::endl;
return resp;
}
diff --git a/LArCalorimeter/LArRecUtils/src/LArOFPeakRecoTool.cxx b/LArCalorimeter/LArRecUtils/src/LArOFPeakRecoTool.cxx
index e03488903ac58dd4736b4714467575821eb2067f..fa475919b67f5ee2023b76b33773593b5be45454 100644
--- a/LArCalorimeter/LArRecUtils/src/LArOFPeakRecoTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArOFPeakRecoTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArRecUtils/LArOFPeakRecoTool.h"
@@ -121,7 +121,6 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
//Computation is done as double
double At=0;
double A=0;
- //std::cout << "***** ChannelID=" << (int)chID << " ; Gain=" << (int)gain << " ; Delay=" << delay << " nIter=" << nIter << std::endl ;
//Tying to avoid doing all checks for every event/channel/iteation step by assuming that
//the number of OFC samples is the same for all delays of a certain cell/gain.
@@ -175,13 +174,10 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
delayIdx=(unsigned)floor(0.5+delay/timeBinWidth);
}
- //std::cout << "Timebinwidth=" << timeBinWidth << " nOFCPhase=" << nOFCPhase << std::endl;
- //std::cout << "Delay= " << delay << " Index=" << delayIdx << std::endl;
//Get first set of OFC's
ILArOFC::OFCRef_t this_OFC_a = dd_ofc->OFC_a(chID,(int)usedGain,delayIdx);
ILArOFC::OFCRef_t this_OFC_b = dd_ofc->OFC_b(chID,(int)usedGain,delayIdx);
const unsigned ofcSize=this_OFC_a.size(); //Assumed to be the same of all delay-indices
- //std::cout << " got OFC " << this_OFC_a.size() << " " << this_OFC_b.size() << std::endl;
//some sanity check on the OFCs
if ( ofcSize == 0 || this_OFC_b.size() == 0 ) {
@@ -207,17 +203,6 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
if(kMax<peak_low) kMax=peak_low;
if(kMax>peak_high) kMax=peak_high;
- /*
- std::cout << "Samples: ";
- for ( unsigned k=0;k<samples.size();k++)
- std::cout << " " << samples[k];
- std::cout << std::endl;
- std::cout << "OFC_a: ";
- for ( unsigned k=0;k<this_OFC_a.size();k++)
- std::cout << " " << this_OFC_a.at(k);
- std::cout << std::endl;
- */
-
float amplitude_save=0.;
float tau_save= 99999.;
unsigned int kMax_save=0;
@@ -227,7 +212,6 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
unsigned int mynIter = nIter;
do {
- //std::cout << "*** Start iteration step: "<< kIter << " kmax=" <<kMax << " delay=" << delay << std::endl;
// Uncomment the following if you suspect that the ofc are corrupt for some phases:
/*
@@ -264,7 +248,6 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
}
result.m_amplitude=A;
result.m_tau = At / A ;
- //std::cout << "Iteration step: " << kIter << " Delay=" << delay << " A = " << A << " tau=" << result.m_tau << std::endl;
//First iteration done, break loop if possible....
if (mynIter<=1) {
@@ -281,13 +264,11 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
// if we are within +-0.5*Dt of time bin, we have converged for sure
if (fabs(result.m_tau) <= (0.5*timeBinWidth)) {
result.m_converged=true;
- // std::cout << "Converged." << std::endl;
delay = delayIdx*timeBinWidth;
break;
}
if (kIter>=mynIter) { //Max. number of iterations reached
- //std::cout << "Did not converge after " << nIter << " iterations." << std::endl;
delay = delayIdx*timeBinWidth;
if (result.m_converged) {
if (fabs(tau_save) < fabs(result.m_tau)) {
@@ -314,7 +295,6 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
delayIdx_save = delayIdx;
}
- //std::cout << "not yet converged" << std::endl ;
delay = delay - result.m_tau; // moved this line up so first iteration delay results treated like subsequent
if(delay<(-0.5*timeBinWidth)) {
@@ -323,9 +303,7 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
delay=delay+m_samplingPeriod;
if( delay < 0 ) delay = 0;
if (delay > timeMax ) delay = timeMax-epsilon;
- //std::cout << " delay too small, shift sample, set delay to " << delay << std::endl ;
} else { // don't shift sample
- //std::cout << " delay too small, set delay to 0 "<< std::endl ;
delay = 0 ;
}
}//else if delay<0
@@ -336,10 +314,8 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
delay=delay-m_samplingPeriod;
if (delay < 0 ) delay=0.;
if( delay > timeMax ) delay = timeMax-epsilon;
- //std::cout << " delay too large , shift sample "<< std::endl ;
} else {
// don't shift sample
- //std::cout << " delay too large set delay to max "<< std::endl ;
delay = timeMax-epsilon;
}
}//end if delay>nOFCPhase
@@ -347,7 +323,6 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
kIter++;
delayIdx=(unsigned)floor(0.5+delay/timeBinWidth);
if (delayIdx>=nOFCPhase) delayIdx = nOFCPhase-1;
- //std::cout << " new kMax, delay,delayIdx " << kMax << " " << delay << " " << delayIdx << std::endl;
//Get next set of OFC's
this_OFC_a = dd_ofc->OFC_a(chID,(int)usedGain,delayIdx);
this_OFC_b = dd_ofc->OFC_b(chID,(int)usedGain,delayIdx);
@@ -357,7 +332,6 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
// go back to overal time
delay = delay + timeOffset; // sign to check
- //std::cout << "Done! A= " << result.m_amplitude << " ; tau= " << result.m_tau << " kIter=" << kIter << " nIter=" << nIter << std::endl;
// get shape
if (m_useShape){
const ILArShape* dd_shape=nullptr;
diff --git a/LArCalorimeter/LArRecUtils/src/LArOnOffMappingAlg.cxx b/LArCalorimeter/LArRecUtils/src/LArOnOffMappingAlg.cxx
index 1eb01fc333509b0bf1de08e2492650d5601ed1fd..cc55fd2f5c69b0254658327ceb702a7e984016db 100644
--- a/LArCalorimeter/LArRecUtils/src/LArOnOffMappingAlg.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArOnOffMappingAlg.cxx
@@ -1,7 +1,7 @@
//dear emacs, this is -*-c++-*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArOnOffMappingAlg.h"
@@ -111,7 +111,6 @@ StatusCode LArOnOffMappingAlg::execute() {
for (unsigned i=0;i<nChan;++i) {
const Identifier id=Identifier(Identifier32(pBlobOnOff[i]));
- //std::cout << "id[" << i <<"] " << std::hex << id.get_compact() << std::dec << std::endl;
if (id.is_valid()) {
const IdentifierHash oflHash=calocellID->calo_cell_hash(id);
const HWIdentifier hwid=larOnlineID->channel_Id(IdentifierHash(i));
diff --git a/LArCalorimeter/LArRecUtils/src/LArParabolaPeakRecoTool.cxx b/LArCalorimeter/LArRecUtils/src/LArParabolaPeakRecoTool.cxx
index 84a58b36be417aa62742b7b2804018133728df4b..faf83eb1046b12eae023e09223202a5395ed476d 100644
--- a/LArCalorimeter/LArRecUtils/src/LArParabolaPeakRecoTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArParabolaPeakRecoTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArRecUtils/LArParabolaPeakRecoTool.h"
@@ -125,7 +125,6 @@ std::vector<float> LArParabolaPeakRecoTool::peak (const std::vector<float>& samp
HepVector beta(3);
for (int i=0;i<3;i++)
{beta[i]=*(it_max-1+i);
- //std::cout << " " << beta[i];
for (int j=0;j<3;j++)
alpha[i][j]=pow(-1+i,j);
}
@@ -159,8 +158,6 @@ std::vector<float> LArParabolaPeakRecoTool::peak (const std::vector<float>& samp
}
}
- //std::cout << "Parabola: Time=" << tmax << " adcmax=" << maxadc << " retval= " << retval << std::endl;
-
solution.push_back(retval);
if(!m_correctBias){
solution.push_back(tmax);
diff --git a/LArCalorimeter/LArRecUtils/src/LArShapePeakRecoTool.cxx b/LArCalorimeter/LArRecUtils/src/LArShapePeakRecoTool.cxx
index 28b8e31e06938653f550b81a726997a99b599099..dc59a42d831b99f54d9989ffda006e0ecfdc317f 100644
--- a/LArCalorimeter/LArRecUtils/src/LArShapePeakRecoTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArShapePeakRecoTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArRecUtils/LArShapePeakRecoTool.h"
@@ -52,8 +52,6 @@ std::vector<float> LArShapePeakRecoTool::peak (const std::vector<float>& samples
delay_max = distance(wave.begin(),wave_max);
- // std::cout << "wave[0] = " << wave[0] << std::endl;
-
// parabola approximation of shape maximum
d = (int) delay_max;
GetShapeParMax(delay_max,shape_max,delay_max-1,wave[d-1],
@@ -96,15 +94,10 @@ std::vector<float> LArShapePeakRecoTool::peak (const std::vector<float>& samples
s2 = sample_2ndmax + 1;
}
- // std::cout << "sample_max = " << sample_max << ", sample_2ndmax = " << sample_2ndmax << ", s1 = " << s1 << ", s2 = " << s2 << std::endl;
-
// Get delay Limits
d1 = 0;
d2 = nbin-1-(s2-s1)*24;
- // std::cout << "d2 = " << d2 << ", s1 = " << s1 << ", s2 = " << s2 << std::endl;
- // std::cout << "sample max = " << sample_max << std::endl;
-
// Loop on all delays to find the best chi2
// i.e. minimise
// chi2 = yi2-yigi*lambda = yi2-yigi*yigi/gi2
@@ -142,9 +135,6 @@ std::vector<float> LArShapePeakRecoTool::peak (const std::vector<float>& samples
float adc_reco = lambda*shape_max;
- // std::cout << "shape max = " << shape_max << ", adc max = " << adc_max << ", lambda = " << lambda << std::endl;
- // std::cout << "delay best = " << delay_best << std::endl;
-
float time_reco = delay_best;
if(delay_best<adc_max) time_reco = delay_best;
diff --git a/LArCalorimeter/LArRecUtils/src/MakeLArCellFromRaw.cxx b/LArCalorimeter/LArRecUtils/src/MakeLArCellFromRaw.cxx
index c20397cb439e890b3a1bd1461188f69379e2ac54..451f897387605c116f3549c07db165d73c757b86 100644
--- a/LArCalorimeter/LArRecUtils/src/MakeLArCellFromRaw.cxx
+++ b/LArCalorimeter/LArRecUtils/src/MakeLArCellFromRaw.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// implementation of MakeLArCellFromRaw
@@ -378,7 +378,6 @@ MakeLArCellFromRaw::getCorrection(LArCell* cell,
}
double c= cell->energy()/en;
-// std::cout<<" Correction init = "<<c<<std::endl;
return c;
}