From 27b9587b583a6fb8bb87682cc283758300b0eb43 Mon Sep 17 00:00:00 2001 From: Alex Austregesilo Date: Thu, 18 Jun 2026 05:04:34 -0400 Subject: [PATCH 1/3] =?UTF-8?q?newer=20compilers=20discourage=20arithmetic?= =?UTF-8?q?=20comparisons=20directly=20between=20a=20floating=E2=80=91poin?= =?UTF-8?q?t=20type=20(double)=20and=20an=20enum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bootstrap_plot_etapi_delta_SPDG_allamps_mass_t_bins.cc | 6 +++--- .../Pol_moments_viafittedPW/Pol_moments_viafittedPW.cc | 4 ++-- .../AmplitudeAnalysis/plot_etapi_delta/plot_etapi_delta.cc | 2 +- .../project_moments_SPD_etapi0_posepsilon.cc | 4 ++-- .../project_moments_polarized/project_moments_polarized.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/programs/AmplitudeAnalysis/Bootstrap_plot_etapi_delta_SPDG_allamps_mass_t_bins/Bootstrap_plot_etapi_delta_SPDG_allamps_mass_t_bins.cc b/src/programs/AmplitudeAnalysis/Bootstrap_plot_etapi_delta_SPDG_allamps_mass_t_bins/Bootstrap_plot_etapi_delta_SPDG_allamps_mass_t_bins.cc index bf9d1a78c..4eb286f28 100644 --- a/src/programs/AmplitudeAnalysis/Bootstrap_plot_etapi_delta_SPDG_allamps_mass_t_bins/Bootstrap_plot_etapi_delta_SPDG_allamps_mass_t_bins.cc +++ b/src/programs/AmplitudeAnalysis/Bootstrap_plot_etapi_delta_SPDG_allamps_mass_t_bins/Bootstrap_plot_etapi_delta_SPDG_allamps_mass_t_bins.cc @@ -107,9 +107,9 @@ int main( int argc, char* argv[] ){ - // print out the bin center - double step = ( highMass - lowMass ) / kNumBins; - double stept = ( hight - lowt ) / kNumBinst; + // print out the bin center + double step = ( highMass - lowMass ) / static_cast(kNumBins); + double stept = ( hight - lowt ) / static_cast(kNumBinst); ofstream outfile[kNumBins][kNumBinst]; // descend into the directory that contains the bins chdir( fitDir.c_str() ); diff --git a/src/programs/AmplitudeAnalysis/Pol_moments_viafittedPW/Pol_moments_viafittedPW.cc b/src/programs/AmplitudeAnalysis/Pol_moments_viafittedPW/Pol_moments_viafittedPW.cc index f55312763..2bdb55277 100644 --- a/src/programs/AmplitudeAnalysis/Pol_moments_viafittedPW/Pol_moments_viafittedPW.cc +++ b/src/programs/AmplitudeAnalysis/Pol_moments_viafittedPW/Pol_moments_viafittedPW.cc @@ -90,8 +90,8 @@ int main( int argc, char* argv[] ){ - double step = ( highMass - lowMass ) / kNumBins; - double stept = ( hight - lowt ) / kNumBinst; + double step = ( highMass - lowMass ) / static_cast(kNumBins); + double stept = ( hight - lowt ) / static_cast(kNumBinst); ofstream outfile; outfile.open( outfileName.c_str() ); diff --git a/src/programs/AmplitudeAnalysis/plot_etapi_delta/plot_etapi_delta.cc b/src/programs/AmplitudeAnalysis/plot_etapi_delta/plot_etapi_delta.cc index 333e74a47..c1bae957f 100644 --- a/src/programs/AmplitudeAnalysis/plot_etapi_delta/plot_etapi_delta.cc +++ b/src/programs/AmplitudeAnalysis/plot_etapi_delta/plot_etapi_delta.cc @@ -44,7 +44,7 @@ int main( int argc, char* argv[] ){ exit(1); } - double step = ( highMass - lowMass ) / kNumBins; + double step = ( highMass - lowMass ) / static_cast(kNumBins); ofstream outfile; outfile.open( outfileName.c_str() ); diff --git a/src/programs/AmplitudeAnalysis/project_moments_SPD_etapi0_posepsilon/project_moments_SPD_etapi0_posepsilon.cc b/src/programs/AmplitudeAnalysis/project_moments_SPD_etapi0_posepsilon/project_moments_SPD_etapi0_posepsilon.cc index 10235d955..169ce853c 100644 --- a/src/programs/AmplitudeAnalysis/project_moments_SPD_etapi0_posepsilon/project_moments_SPD_etapi0_posepsilon.cc +++ b/src/programs/AmplitudeAnalysis/project_moments_SPD_etapi0_posepsilon/project_moments_SPD_etapi0_posepsilon.cc @@ -54,8 +54,8 @@ int main( int argc, char* argv[] ){ exit(1); } - double step = ( highMass - lowMass ) / kNumBins; - double stept = ( hight - lowt ) / kNumBinst; + double step = ( highMass - lowMass ) / static_cast(kNumBins); + double stept = ( hight - lowt ) / static_cast(kNumBinst); ofstream outfile; outfile.open( outfileName.c_str() ); diff --git a/src/programs/AmplitudeAnalysis/project_moments_polarized/project_moments_polarized.cpp b/src/programs/AmplitudeAnalysis/project_moments_polarized/project_moments_polarized.cpp index f8931d8db..4a9b3b0ae 100644 --- a/src/programs/AmplitudeAnalysis/project_moments_polarized/project_moments_polarized.cpp +++ b/src/programs/AmplitudeAnalysis/project_moments_polarized/project_moments_polarized.cpp @@ -105,8 +105,8 @@ positive.push_back(wave("G1+", 4, 1)); Biggest_lm(ws, &LMAX); - double step = ( highMass - lowMass ) / kNumBins; - double stept = ( hight - lowt ) / kNumBinst; + double step = ( highMass - lowMass ) / static_cast(kNumBins); + double stept = ( hight - lowt ) / static_cast(kNumBinst); ofstream outfile; outfile.open( outfileName.c_str() ); From 224a373bea7b926ed1beab6f2f5f550d21e43338 Mon Sep 17 00:00:00 2001 From: Alexander Austregesilo Date: Mon, 22 Jun 2026 14:16:30 -0400 Subject: [PATCH 2/3] ROOT CFLAGS are actually for C++, avoids warnings --- src/SBMS/sbms.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/SBMS/sbms.py b/src/SBMS/sbms.py index 8e7f8ddf2..c15abf85e 100644 --- a/src/SBMS/sbms.py +++ b/src/SBMS/sbms.py @@ -877,7 +877,10 @@ def AddROOT(env): AddROOT.ROOT_CFLAGS += ' -DHAVE_TMVA=1' AddROOT.ROOT_LINKFLAGS += ' -lTMVA' - AddCompileFlags(env, AddROOT.ROOT_CFLAGS) + # AddCompileFlags(env, AddROOT.ROOT_CFLAGS) + # ROOT CFLAGS are actually C++ flags → apply only to CXXFLAGS + env.AppendUnique(CXXFLAGS = AddROOT.ROOT_CFLAGS.split()) + AddLinkFlags(env, AddROOT.ROOT_LINKFLAGS) if env['OSNAME'].startswith("Darwin_macosx"): From def5f2271738058aaf2f8dc05ae4a693d35a37bd Mon Sep 17 00:00:00 2001 From: Alex Austregesilo Date: Mon, 22 Jun 2026 14:19:59 -0400 Subject: [PATCH 3/3] unused variables --- src/SBMS/sbms.py | 2 +- src/libraries/UTILITIES/BeamProperties.cc | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/SBMS/sbms.py b/src/SBMS/sbms.py index c15abf85e..7c2b1daf7 100644 --- a/src/SBMS/sbms.py +++ b/src/SBMS/sbms.py @@ -878,7 +878,7 @@ def AddROOT(env): AddROOT.ROOT_LINKFLAGS += ' -lTMVA' # AddCompileFlags(env, AddROOT.ROOT_CFLAGS) - # ROOT CFLAGS are actually C++ flags → apply only to CXXFLAGS + # ROOT CFLAGS are actually C++ flags: apply only to CXXFLAGS env.AppendUnique(CXXFLAGS = AddROOT.ROOT_CFLAGS.split()) AddLinkFlags(env, AddROOT.ROOT_LINKFLAGS) diff --git a/src/libraries/UTILITIES/BeamProperties.cc b/src/libraries/UTILITIES/BeamProperties.cc index 8e80b64c1..85b5e3285 100644 --- a/src/libraries/UTILITIES/BeamProperties.cc +++ b/src/libraries/UTILITIES/BeamProperties.cc @@ -446,18 +446,18 @@ void BeamProperties::fillTaggedFluxFromCCDB() { calib->GetCalib(tagh_scaled_energy, "PHOTON_BEAM/hodoscope/scaled_energy_range"); calib->GetCalib(tagm_scaled_energy, "PHOTON_BEAM/microscope/scaled_energy_range"); - double e_low_tagh = 0; - double e_high_tagh = 0; + // double e_low_tagh = 0; + // double e_high_tagh = 0; double e_low_tagm = 0; double e_high_tagm = 0; double delta_e = 0; if (endpoint_calib.size() > 0 && photon_endpoint.size() > 0) delta_e = photon_endpoint[0] - endpoint_calib[0]; - if (tagh_scaled_energy.size() > 0) { - e_low_tagh = tagh_scaled_energy[tagh_scaled_energy.size() - 1][1] * endpoint_calib[0] + delta_e; - e_high_tagh = tagh_scaled_energy[0][2] * endpoint_calib[0] + delta_e; - } + // if (tagh_scaled_energy.size() > 0) { + // e_low_tagh = tagh_scaled_energy[tagh_scaled_energy.size() - 1][1] * endpoint_calib[0] + delta_e; + // e_high_tagh = tagh_scaled_energy[0][2] * endpoint_calib[0] + delta_e; + // } if (tagm_scaled_energy.size() > 0) { e_low_tagm = tagm_scaled_energy[tagm_scaled_energy.size() - 1][1] * endpoint_calib[0] + delta_e; e_high_tagm = tagm_scaled_energy[0][2] * endpoint_calib[0] + delta_e;