Skip to content

[spack mpd] Changes needed to built with gcc@12.5.0 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gartung wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[spack mpd] Changes needed to built with gcc@12.5.0 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cet_cmake_env()
cet_set_compiler_flags(DIAGS CAUTIOUS
WERROR
NO_UNDEFINED
EXTRA_FLAGS -pedantic -Wno-unused-local-typedefs
EXTRA_FLAGS -pedantic -Wno-unused-local-typedefs -Wno-error=array-bounds
)

cet_report_compiler_flags(REPORT_THRESHOLD VERBOSE)
Expand Down
8 changes: 4 additions & 4 deletions ubreco/DetectorSystematics/WireModifier_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,22 +907,22 @@ void sys::WireModifier::ModifyROI(std::vector<float> & roi_data,

}

if(isnan(q_orig)) {
if(std::isnan(q_orig)) {
std::cout << "WARNING: obtained q_orig = NaN... setting to zero" << std::endl;
q_orig = 0.;
}
if(isnan(q_mod)) {
if(std::isnan(q_mod)) {
std::cout << "WARNING: obtained q_mod = NaN... setting to zero" << std::endl;
q_mod = 0.;
}

scale_ratio = q_mod / q_orig;

if(isnan(scale_ratio)) {
if(std::isnan(scale_ratio)) {
std::cout << "WARNING: obtained scale_ratio = " << q_mod << " / " << q_orig << " = NaN... setting to 1" << std::endl;
scale_ratio = 1.;
}
if(isinf(scale_ratio)) {
if(std::isinf(scale_ratio)) {
std::cout << "WARNING: obtained scale_ratio = " << q_mod << " / " << q_orig << " = inf... setting to 1" << std::endl;
scale_ratio = 1.0;
}
Expand Down
2 changes: 1 addition & 1 deletion ubreco/LLSelectionTool/OpT0Finder/Algorithms/QLLMatch.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ namespace flashana {
if(_mode == kLLHD) {
/* Replaced block to be used in uboonecode
_current_llhd -= std::log10(TMath::Poisson(O,H));
if(std::isnan(_current_llhd) || isinf(_current_llhd)) _current_llhd = 1.e6;
if(std::isnan(_current_llhd) || std::isinf(_current_llhd)) _current_llhd = 1.e6;
*/
// Updated block
double arg = TMath::Poisson(O,H);
Expand Down
4 changes: 2 additions & 2 deletions ubreco/MichelReco/Algo/ConeHitFinder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ namespace michel {
// fit michel to a straight line
auto fitinfo = _clusterCalc.GetLinearFit(michel);

if ( isnan(fitinfo.first) == true)
if ( std::isnan(fitinfo.first) == true)
return true;
if (isnan(fitinfo.second) == true)
if (std::isnan(fitinfo.second) == true)
return true;

auto start = michel._start;
Expand Down
4 changes: 2 additions & 2 deletions ubreco/MichelReco/Algo/PhotonFinder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ namespace michel {
// fit michel to a straight line
auto fitinfo = _clusterCalc.GetLinearFit(michel);

if ( isnan(fitinfo.first) == true)
if ( std::isnan(fitinfo.first) == true)
return true;
if (isnan(fitinfo.second) == true)
if (std::isnan(fitinfo.second) == true)
return true;

auto start = michel._start;
Expand Down
4 changes: 2 additions & 2 deletions ubreco/MichelReco/Fmwk/ClusterVectorCalculator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,12 +285,12 @@ namespace michel {
<< "r: " << r << std::endl;
Print(msg::kDEBUG,__FUNCTION__,ss.str());
}
if(isnan(r)) r = 0.0;
if(std::isnan(r)) r = 0.0;
R.push_back(r);


// if(R.size() != 1 && R.size() != hits.size())
// if(isnan(r)) Print(msg::kEXCEPTION,__FUNCTION__,"Covariance is nan not on edge");
// if(std::isnan(r)) Print(msg::kEXCEPTION,__FUNCTION__,"Covariance is nan not on edge");

X.clear(); Y.clear();
}
Expand Down