diff --git a/TileCalorimeter/TileCalib/TileCalibBlobObjs/TileCalibBlobObjs/TileCalibDrawerOfc.h b/TileCalorimeter/TileCalib/TileCalibBlobObjs/TileCalibBlobObjs/TileCalibDrawerOfc.h index 45837df3fcce34658da8a9020cf8f02066624be6..b777b1dd39d42e9987a9c95aed5651fbb0775aa7 100644 --- a/TileCalorimeter/TileCalib/TileCalibBlobObjs/TileCalibBlobObjs/TileCalibDrawerOfc.h +++ b/TileCalorimeter/TileCalib/TileCalibBlobObjs/TileCalibBlobObjs/TileCalibDrawerOfc.h @@ -25,13 +25,14 @@ #include "TileCalibBlobObjs/TileCalibDrawerBase.h" #include "TileCalibBlobObjs/TileCalibType.h" +#include "CoralBase/Blob.h" #include <stdint.h> #include <iostream> #include <vector> -#include "CoralBase/Blob.h" #include <cstdlib> #include <algorithm> #include <cstring> +#include <cmath> #define PHASE_PRECISION 0.1 @@ -199,7 +200,7 @@ inline int32_t TileCalibDrawerOfc::getNPhases() const { __attribute__((always_inline)) inline unsigned int TileCalibDrawerOfc::getPhaseNumber(unsigned int channel, unsigned int adc, float& phase) const { - int db_phase = (int) round(phase * (1 / PHASE_PRECISION)); // Phases are stored as int(10*phase) in DB + int db_phase = (int) std::round(phase * (1 / PHASE_PRECISION)); // Phases are stored as int(10*phase) in DB int32_t* beg = getPhaseStartAddress(channel, adc, 0); int32_t* end = beg + std::abs(getNPhases()); int32_t* pos = std::lower_bound(beg, end, db_phase); diff --git a/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileCalibDrawerOfc.cxx b/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileCalibDrawerOfc.cxx index f0954861b7ec64740854a7c5a02cd35edd450aec..39b395482547b59f34ed86bfc032c0f8a865bd10 100644 --- a/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileCalibDrawerOfc.cxx +++ b/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileCalibDrawerOfc.cxx @@ -126,7 +126,7 @@ void TileCalibDrawerOfc::setPhases(unsigned int channel, unsigned int adc, const std::set<int32_t> phaseSet; for (const float phase : phases) { - phaseSet.insert((int32_t) round(phase * (1 / PHASE_PRECISION))); // Phases are stored as int(10*phase) in DB + phaseSet.insert((int32_t) std::round(phase * (1 / PHASE_PRECISION))); // Phases are stored as int(10*phase) in DB } if(int(phaseSet.size()) != std::abs(getNPhases())){