Skip to content

Commit

Permalink
fix error in c++20 due to ambiguous types
Browse files Browse the repository at this point in the history
  • Loading branch information
joequant committed Sep 15, 2024
1 parent 47c8390 commit 8c8f18d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion DRdigi/src/DigiSiPM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ StatusCode DigiSiPM::execute(const EventContext&) const {

const double integral = anaSignal.integral(m_gateStart,m_gateL,m_thres); // (intStart, intGate, threshold)
const double toa = anaSignal.toa(m_gateStart,m_gateL,m_thres); // (intStart, intGate, threshold)
const double gateEnd = m_gateStart + m_gateL;
const double gateEnd = static_cast<double>(m_gateStart) + static_cast<double>(m_gateL);

digiHit.setEnergy( integral );
digiHit.setCellID( rawhit.getCellID() );
Expand Down
3 changes: 2 additions & 1 deletion DRreco/src/DRcalib3D.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ StatusCode DRcalib3D::execute(const EventContext&) const {
double scale = pSeg->IsCerenkov(cID) ? m_cherenScale.value() : m_scintScale.value();

// create a histogram to do FFT and fill it
std::unique_ptr<TH1D> waveHist = std::make_unique<TH1D>("waveHist","waveHist",m_nbins,m_gateStart,m_gateStart+m_gateL);
std::unique_ptr<TH1D> waveHist = std::make_unique<TH1D>("waveHist","waveHist",m_nbins,m_gateStart,
static_cast<double>(m_gateStart)+static_cast<double>(m_gateL));
float sampling = waveform.getInterval();
float startTime = waveform.getTime();

Expand Down

0 comments on commit 8c8f18d

Please sign in to comment.