Skip to content
Snippets Groups Projects
Commit dd49737f authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'fix_clang10_MdtCalibData' into 'master'

MdtCalibData - Fix clang 10 compilation

See merge request !45330
parents 0089e379 31e12ffd
No related branches found
No related tags found
5 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!51674Fixing hotSpotInHIST for Run3 HIST,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45330MdtCalibData - Fix clang 10 compilation
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "MdtCalibData/MdtSlewCorFuncHardcoded.h" #include "MdtCalibData/MdtSlewCorFuncHardcoded.h"
#include <cmath> #include <cmath>
namespace MuonCalib { namespace MuonCalib {
...@@ -25,12 +26,11 @@ double MdtSlewCorFuncHardcoded::correction(double /*t*/, double adc) const { ...@@ -25,12 +26,11 @@ double MdtSlewCorFuncHardcoded::correction(double /*t*/, double adc) const {
// Constant 109 is from an optimization of the timeslew correction // Constant 109 is from an optimization of the timeslew correction
// calibrated_p(i) is the integrated charge as a function of ADC // calibrated_p(i) is the integrated charge as a function of ADC
if( adc> 400. || adc<0. ) return 0.; if( adc> 400. || adc<0. ) return 0.;
constexpr double A = 109. * std::exp(-1.11925e+00 ); static const double A = 109. * std::exp(-1.11925e+00 );
constexpr double adc_chan_conversion = 25./32.; constexpr double adc_chan_conversion = 25./32.;
constexpr double Lambda = -2.08708e-02*adc_chan_conversion; //ADC to ns constexpr double Lambda = -2.08708e-02*adc_chan_conversion; //ADC to ns
const int adc_int = adc;
// Convert ADC to integrated charge for AMT chip, see ATL-MUON-2002-003 // Convert ADC to integrated charge for AMT chip, see ATL-MUON-2002-003
return A * std::exp( adc_int * Lambda); return A * std::exp( adc * Lambda);
} }
} //namespace MuonCalib } //namespace MuonCalib
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment