Fix some warnings.

sandialabs · Oct 12, 2023 · c6bfb8c · c6bfb8c
1 parent 2e674fd
commit c6bfb8c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/OneOverR2Calc.cpp b/src/OneOverR2Calc.cpp
@@ -444,7 +444,9 @@ void OneOverR2Calc::handleAppUrl( std::string query_str )
     {
       try
       {
-        std::stod(value);
+        const double test_val = std::stod(value);
+        if( IsInf(test_val) || IsNan(test_val) )
+          throw runtime_error( "NaN or Inf" );
       }catch( std::exception & )
       {
         throw runtime_error( "1/r2 Calc.: invalid '" + name + "' value '" + value + "' in URI." );

diff --git a/src/RelActManualGui.cpp b/src/RelActManualGui.cpp
@@ -1197,7 +1197,7 @@ void RelActManualGui::calculateSolution()
           if( (fabs(peak.m_energy - p->gammaParticleEnergy()) > (match_tol_sigma*(peak.m_fwhm/2.35482)))
              && (match_tol_sigma > 0.0) )
           {
-            energy_cal_match_warning_energies.emplace( peak.m_energy, p->gammaParticleEnergy() );
+            energy_cal_match_warning_energies.emplace( static_cast<float>(peak.m_energy), p->gammaParticleEnergy() );
           }
 
           peak.m_energy = p->gammaParticleEnergy();

diff --git a/src/SearchMode3DDataModel.cpp b/src/SearchMode3DDataModel.cpp
@@ -136,7 +136,7 @@ int SearchMode3DDataModel::maxNumEnergyChannels() const { return m_maxNumChannel
 std::pair<float,float> SearchMode3DDataModel::minMaxCounts( const float time_min, const float time_max,
                                                             const float e_min, const float e_max ) const
 {
-  std::pair<float,float> answer( 0, 1.0 );
+  std::pair<float,float> answer( 0.0f, 1.0f );
 
   auto timeStart = lower_bound( begin(m_times), end(m_times), time_min );
   auto timeEnd = upper_bound( begin(m_times), end(m_times), time_max );