diff --git a/TileCalorimeter/TileDetDescr/src/TileDetDescrManager.cxx b/TileCalorimeter/TileDetDescr/src/TileDetDescrManager.cxx index b9aa52c52284e2d79c3e21d119c0e72ad3a4abf7..d337f3b0b09ac9920735c46be8f7509fabad45d8 100755 --- a/TileCalorimeter/TileDetDescr/src/TileDetDescrManager.cxx +++ b/TileCalorimeter/TileDetDescr/src/TileDetDescrManager.cxx @@ -15,7 +15,6 @@ #include "GaudiKernel/MsgStream.h" #include "GaudiKernel/SystemOfUnits.h" #include "AthenaKernel/getMessageSvc.h" -#include "boost/io/ios_state.hpp" #include <iostream> #include <iomanip> @@ -319,16 +318,15 @@ void TileDetDescrManager::create_elements() emin = -etmp; } + if ( m_verbose ) + std::cout << std::setiosflags(std::ios::fixed) + << std::setw(9) << std::setprecision(2); + // and now create calo descriptors per every module ( 6 * 64 = 384 in total) double phi = descr->phi_min() + dphi/2.; - boost::io::ios_base_all_saver coutsave (std::cout); for (int iphi=0; iphi<nphi; ++iphi) { - if ( m_verbose && ( 0 == iphi ) ) - std::cout << std::setiosflags(std::ios::fixed) - << std::setw(9) << std::setprecision(2); - int module = iphi; // we count modules from 0 to N always //Temporary solution for cell volumes @@ -855,6 +853,8 @@ void TileDetDescrManager::create_elements() } phi += dphi; } + if ( m_verbose ) + std::cout << std::resetiosflags(std::ios::fixed); } MLOG(DEBUG) << n_cells << " cells and " @@ -882,7 +882,6 @@ void TileDetDescrManager::add_calodescr(CaloDetDescriptor* descr) m_calo_descr_map[index] = descr; if (m_verbose) { - boost::io::ios_base_all_saver coutsave (std::cout); std::cout << std::setiosflags(std::ios::fixed) << std::setw(9) << std::setprecision(4); std::cout << "new Tile CaloDetDescriptor" << std::endl; @@ -905,6 +904,7 @@ void TileDetDescrManager::add_calodescr(CaloDetDescriptor* descr) std::cout << " calo_r_max " << descr->calo_r_max() << std::endl; std::cout << " calo_z_min " << descr->calo_z_min() << std::endl; std::cout << " calo_z_max " << descr->calo_z_max() << std::endl; + std::cout << std::resetiosflags(std::ios::fixed); } } diff --git a/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx b/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx index 623f10df95c3e5b677d01edeb3c4546ce0d54032..841140f4019f75776e9bc85d22a6424297cfa6da 100755 --- a/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx +++ b/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx @@ -37,7 +37,6 @@ #include "GaudiKernel/MsgStream.h" #include "GaudiKernel/SystemOfUnits.h" -#include "boost/io/ios_state.hpp" #include <stdexcept> #include <iostream> #include <limits> @@ -2484,6 +2483,7 @@ void TileGeoSectionBuilder::checking(std::string Name, bool print, int level, <<" dX1,dX2= "<<X1<<" "<<X2 <<" dY1,dY2= "<<Y1<<" "<<Y2 <<" dZ= "<<Z + << std::resetiosflags(std::ios::fixed) <<endmsg; } if (X1 < rless && X2 < rless) @@ -2759,8 +2759,6 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager, (*m_log) << MSG::DEBUG << "TileGeoSectionBuilder::computeCellDim for detector=" << detector << endmsg; - boost::io::ios_all_saver ias (std::cout); - /** Vectors holding rMin, rMax, zMin, zMax for each tilerow of the cell */ std::vector<double> rmins; std::vector<double> rmaxs; @@ -3019,6 +3017,7 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager, << cellDimNeg->getZMax(jj) << "\n"; std::cout << " >> CellNeg Volume is " << cellDimNeg->getVolume()*(1./Gaudi::Units::cm3) << " cm^3\n"; } + std::cout << std::resetiosflags(std::ios::fixed); } /* ------------------------------------------------------------------------------------------------ */ } @@ -3148,6 +3147,7 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager, << cellDimNeg->getZMin(jj) << " " << cellDimNeg->getZMax(jj) << "\n"; std::cout << " >> CellNeg Volume is " << cellDimNeg->getVolume()*(1./Gaudi::Units::cm3) << " cm^3\n"; + std::cout << std::resetiosflags(std::ios::fixed); } /* -------------------------------------------- */ } @@ -3240,6 +3240,7 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager, << cellDimNeg->getZMin(jj) << " " << cellDimNeg->getZMax(jj) << "\n"; std::cout << " >> CellNeg Volume is " << cellDimNeg->getVolume()*(1./Gaudi::Units::cm3) << " cm^3\n"; + std::cout << std::resetiosflags(std::ios::fixed); } /* -------------------------------------------- */ } @@ -3400,22 +3401,22 @@ void TileGeoSectionBuilder::setExtendedPeriodThickness(double val) void TileGeoSectionBuilder::checktransfunc(double absorber, double period, int np, double center) { - boost::io::ios_all_saver ias (std::cout); - std::cout << std::setprecision (std::numeric_limits<double>::digits10 + 1) + (*m_log) << MSG::VERBOSE + << std::setprecision (std::numeric_limits<double>::digits10 + 1) << " Absorber center = " << center << " length = " << absorber << " period = " << period << " nperiods = " << np - << std::endl; + << endmsg; double zC,dZ,z1,z2=-absorber/2.+center; for (int i=0; i<np; ++i) { zC = (period*(2*i+1)-absorber)/2. + center; z1 = zC - period/2.; dZ = z1 - z2; z2 = zC + period/2.; - std::cout << std::setw(4) - << i << " z1= " << z1 << " z2= " << z2 - << " dist from previous= " << dZ << std::endl; + (*m_log) << MSG::VERBOSE << std::setw(4) + << i << " z1= " << z1 << " z2= " << z2 + << " dist from previous= " << dZ << endmsg; } }