Skip to content
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

tidy: ROOT includes #286

Merged
merged 4 commits into from
Jan 13, 2025
Merged

tidy: ROOT includes #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b78245
Tidy root flags
KSkwarczynski Jan 11, 2025
4b84181
I hate root...
KSkwarczynski Jan 11, 2025
51ebdc2
bump version
KSkwarczynski Jan 12, 2025
6a5adf4
tidy: modify spline printout
KSkwarczynski Jan 13, 2025
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 @@ -3,7 +3,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
# CMake version check
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)

project(MaCh3 VERSION 1.3.2 LANGUAGES CXX)
project(MaCh3 VERSION 1.3.3 LANGUAGES CXX)
set(MaCh3_VERSION ${PROJECT_VERSION})

#LP - This option name is confusing, but I wont change it now.
Expand Down
8 changes: 8 additions & 0 deletions Diagnostics/CombineMaCh3Chains.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
// ROOT includes
#include "TList.h"
#include "TFile.h"
Expand All @@ -7,6 +14,7 @@
#include "TFileMerger.h"
#include "TKey.h"
#include "TROOT.h"
#pragma GCC diagnostic pop

// MaCh3 includes
#include "manager/manager.h"
Expand Down
8 changes: 8 additions & 0 deletions Diagnostics/GetPenaltyTerm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
// ROOT includes
#include "TFile.h"
#include "TBranch.h"
Expand All @@ -15,6 +22,7 @@
#include "TColor.h"
#include "TObjString.h"
#include "TROOT.h"
#pragma GCC diagnostic pop

#ifdef MULTITHREAD
#include "omp.h"
Expand Down
8 changes: 8 additions & 0 deletions Diagnostics/RHat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
// ROOT includes
#include "TObjArray.h"
#include "TChain.h"
Expand All @@ -13,6 +20,7 @@
#include "TColor.h"
#include "TStyle.h"
#include "TROOT.h"
#pragma GCC diagnostic pop

#ifdef MULTITHREAD
#include "omp.h"
Expand Down
8 changes: 8 additions & 0 deletions Diagnostics/RHat_HighMem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
// ROOT includes
#include "TObjArray.h"
#include "TChain.h"
Expand All @@ -13,6 +20,7 @@
#include "TColor.h"
#include "TStyle.h"
#include "TROOT.h"
#pragma GCC diagnostic pop

#ifdef MULTITHREAD
#include "omp.h"
Expand Down
2 changes: 1 addition & 1 deletion Doc/Doxyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "MaCh3"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.3.2
PROJECT_NUMBER = 1.3.3

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
8 changes: 8 additions & 0 deletions covariance/CovarianceUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#pragma once

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
// ROOT includes
#include "TMatrixT.h"
#include "TMatrixDSym.h"
Expand All @@ -17,6 +24,7 @@
#include "TMatrixDSymEigen.h"
#include "TMatrixDEigen.h"
#include "TDecompSVD.h"
#pragma GCC diagnostic pop

#ifdef MULTITHREAD
#include "omp.h"
Expand Down
2 changes: 1 addition & 1 deletion manager/CMakeLists.txt
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this used for? is it needed if it compiled ok before?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was breaking DUNE compilation after the previous CMake cleanup. It's required for linking to TVector3 and TLorentzVector (among other things).

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if(NOT CPU_ONLY)
endif()

#If compiling with GPU is not enabled MaCh3GPUCompilerOptions will be empty
target_link_libraries(Manager PUBLIC MaCh3CompilerOptions MaCh3GPUCompilerOptions yaml-cpp spdlog NuOscillator ROOT::Tree ROOT::Hist)
target_link_libraries(Manager PUBLIC MaCh3CompilerOptions MaCh3GPUCompilerOptions yaml-cpp spdlog NuOscillator ROOT::Tree ROOT::Hist ROOT::Physics)
target_link_libraries(Manager PRIVATE MaCh3Warnings)

target_include_directories(Manager PUBLIC
Expand Down
7 changes: 7 additions & 0 deletions manager/Monitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,19 @@
#include <vector>
#include <cstdlib>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
// ROOT include
#include "TTree.h"
#include "TBranch.h"
#include "TMacro.h"
#include "TChain.h"
#include "TStopwatch.h"
#pragma GCC diagnostic pop

// MaCh3 includes
#include "manager/MaCh3Logger.h"
Expand Down
7 changes: 7 additions & 0 deletions manager/YamlHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,17 @@
#include <string>
#include <cxxabi.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
// ROOT Includes
#include "TMacro.h"
#include "TList.h"
#include "TObjString.h"
#pragma GCC diagnostic pop

// yaml Includes
#include "yaml-cpp/yaml.h"
Expand Down
8 changes: 8 additions & 0 deletions manager/manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
// ROOT include
#include "TFile.h"
#pragma GCC diagnostic pop

#include "manager/manager.h"

Expand Down
8 changes: 8 additions & 0 deletions mcmc/MCMCProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
#include "MCMCProcessor.h"

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#include "TChain.h"
#include "TF1.h"
#pragma GCC diagnostic pop

//Only if GPU is enabled
#ifdef CUDA
Expand Down
9 changes: 9 additions & 0 deletions mcmc/MCMCProcessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
#include <complex>
#include <cstdio>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
// ROOT includes
#include "TFile.h"
#include "TBranch.h"
Expand All @@ -31,6 +38,8 @@
#include "TMath.h"
#include "TMatrixDSymEigen.h"
#include "TVirtualFFT.h"
#pragma GCC diagnostic pop


// MaCh3 includes
#include "mcmc/StatisticalUtils.h"
Expand Down
1 change: 0 additions & 1 deletion mcmc/MaCh3Factory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// MaCh3 includes
#include "mcmc/MaCh3Factory.h"


// ********************************************
std::unique_ptr<FitterBase> MaCh3FitterFactory(manager *fitMan) {
// ********************************************
Expand Down
3 changes: 0 additions & 3 deletions mcmc/SampleSummary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
#pragma once

// ROOT includes
#include "TROOT.h"

// MaCh3 includes
#include "samplePDF/samplePDFBase.h"
#include "mcmc/StatisticalUtils.h"
Expand Down
8 changes: 8 additions & 0 deletions plotting/GetPostfitParamPlots.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
#include <iomanip>
#include <algorithm>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#include "TROOT.h"
#include "TGaxis.h"
#include "TString.h"
Expand All @@ -19,6 +26,7 @@
#include "TCandle.h"
#include "TFrame.h"
#include "TGraphAsymmErrors.h"
#pragma GCC diagnostic pop

#include "plottingUtils/plottingUtils.h"
#include "plottingUtils/plottingManager.h"
Expand Down
12 changes: 1 addition & 11 deletions plotting/MatrixPlotter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
#include <iostream>
#include <algorithm>

#include "TFile.h"
#include "TH2D.h"
#include "TCanvas.h"
#include "TStyle.h"
#include "TError.h"
#include "TPaletteAxis.h"
#include "TColor.h"

//MaCh3 Includes
#include "plottingUtils/plottingUtils.h"
#include "plottingUtils/plottingManager.h"

Expand Down
5 changes: 0 additions & 5 deletions plotting/plottingUtils/plottingManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
#include <unistd.h>
#include <vector>

// ROOT includes
#include "TColor.h"
#include "TH1.h"
#include "TStyle.h"

// MaCh3 Includes
#include "manager/MaCh3Logger.h"
#include "manager/YamlHelper.h"
Expand Down
8 changes: 8 additions & 0 deletions plotting/plottingUtils/plottingUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
#include <iostream>
#include <map>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
// ROOT
#include "TCanvas.h"
#include "TGraph2D.h"
Expand All @@ -29,6 +36,7 @@
#include "TROOT.h"
#include "TStyle.h"
#include "TMultiGraph.h"
#pragma GCC diagnostic pop

namespace MaCh3Plotting {
/// @defgroup Utils Plotting Utility Functions
Expand Down
8 changes: 8 additions & 0 deletions plotting/plottingUtils/styleManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@
#include "manager/YamlHelper.h"
#include "manager/MaCh3Exception.h"

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
// ROOT Things
#include "TColor.h"
#include "TH1.h"
#include "TStyle.h"
#pragma GCC diagnostic pop

namespace MaCh3Plotting {
/// @author Ewan Miller
Expand Down
8 changes: 8 additions & 0 deletions samplePDF/HistogramUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#include "TList.h"
#include "TObjArray.h"
#pragma GCC diagnostic pop

#include "samplePDF/HistogramUtils.h"

Expand Down
8 changes: 8 additions & 0 deletions samplePDF/HistogramUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
#pragma once

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
// ROOT include
#include "TGraphAsymmErrors.h"
#include "TLorentzVector.h"
#include "TObjString.h"
#pragma GCC diagnostic pop

// MaCh3 inlcudes
#include "samplePDF/Structs.h"
Expand Down
20 changes: 12 additions & 8 deletions samplePDF/Structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,6 @@ constexpr static const int Unity_Int = 1;
#include <list>
#include <unordered_map>

// ROOT include
#include "TSpline.h"
#include "TObjString.h"
#include "TFile.h"
#include "TF1.h"
#include "TH2Poly.h"
#include "TH1.h"

#ifdef MULTITHREAD
#include "omp.h"
#endif
Expand All @@ -74,7 +66,19 @@ constexpr static const int Unity_Int = 1;
#include "manager/MaCh3Logger.h"

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wconversion"
// ROOT include
#include "TSpline.h"
#include "TObjString.h"
#include "TFile.h"
#include "TF1.h"
#include "TH2Poly.h"
#include "TH1.h"
// NuOscillator includes
#include "Constants/OscillatorConstants.h"
#pragma GCC diagnostic pop

Expand Down
Loading
Loading